Changeset 383 for trunk/src/sh_string.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_string.c (modified) (4 diffs)

trunk/src/sh_string.c

@@ -47 +47 @@
       if (*s) 
         {
-          a = s;
-
           /* move a to next delim
            */
@@ -257 +255 @@
   char * s = line;
   char * p;
+  unsigned int sind = (prefix) ? strlen(prefix) : 0;
 
   while ( *s && isspace((int)*s) ) ++s;
   if (prefix && 0 != strncmp(s, prefix, strlen(prefix)))
     return NULL;
-  s = &s[strlen(prefix)];
+  s = &s[sind];
   while ( *s && isspace((int)*s) ) ++s;
   if (!s || (*s != '('))
@@ -437 +436 @@
   s      = SH_ALLOC(sizeof(sh_string));
   s->str = SH_ALLOC(len+1);
-  memcpy(s->str, str, len);
+  if (str)
+    memcpy(s->str, str, len);
+  else
+    s->str[0] = '\0';
   s->str[len] = '\0';
   s->siz = len+1;
@@ -599 +601 @@
 
   curr = -1;
-  last = -1;
 
   for (i = 0; i < ovecnum; ++i)