Changeset 383 for trunk/src/sh_gpg.c

Timestamp:

Dec 5, 2011, 10:30:33 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #281 (warnings from clang static analyzer).

File:

• trunk/src/sh_gpg.c (modified) (4 diffs)

trunk/src/sh_gpg.c

@@ -173 +173 @@
 
   k = 0;
-  for (i = 0; i < 127; ++i)
-    {
-      if (test_ptr2[i] == '\0')
-        break;
-      if (test_ptr2[i] != ' ')
-        {
-          wstrip2[k] = test_ptr2[i];
-          ++k;
+  if (test_ptr2)
+    {
+      for (i = 0; i < 127; ++i)
+        {
+          if (test_ptr2[i] == '\0')
+            break;
+          if (test_ptr2[i] != ' ')
+            {
+              wstrip2[k] = test_ptr2[i];
+              ++k;
+            }
         }
     }
@@ -552 +555 @@
       pfd = val_return;
       sl_close(checkfd);
-      checkfd = -1;
+      /* checkfd = -1; *//* never read */
 
       sl_snprintf(pname, sizeof(pname), _("/proc/self/fd/%d"), pfd);
@@ -815 +818 @@
         {
           sl_strlcpy (sign_id, &line[25], SH_MINIBUF+1);
-          sign_id[sl_strlen(sign_id)-1] = '\0';  /* remove trailing '"' */
+          if (sign_id)
+            sign_id[sl_strlen(sign_id)-1] = '\0';  /* remove trailing '"' */
           have_id = GOOD;
         } 
@@ -839 +843 @@
           ptr = strchr ( line, '"');
           ++ptr;
-          sl_strlcpy (sign_id, ptr, SH_MINIBUF+1);
-          sign_id[sl_strlen(sign_id)-1] = '\0'; /* remove trailing dot */
-          sign_id[sl_strlen(sign_id)-2] = '\0'; /* remove trailing '"' */
+          if (ptr)
+            {
+              sl_strlcpy (sign_id, ptr, SH_MINIBUF+1);
+              sign_id[sl_strlen(sign_id)-1] = '\0'; /* remove trailing dot */
+              sign_id[sl_strlen(sign_id)-2] = '\0'; /* remove trailing '"' */
+            }
+          else
+            {
+              sl_strlcpy (sign_id, _("(null)"), SH_MINIBUF+1);
+            }
           have_id = GOOD;
         }