Changeset 23991

Timestamp:

09/29/13 04:06:11 (10 years ago)

Author:

nit

Message:

[titan] fix

Location:

titan/titan

Files:

• global.h (modified) (3 diffs)
• skin.h (modified) (1 diff)

titan/titan/global.h

@@ -5119 +5119 @@
 {
         char *buf = NULL, *buf1 = NULL, *buf2 = NULL;
-        unsigned char buf3 = '\0';
 
         buf = ostrstr(line, searchstr);
@@ -5135 +5134 @@
                         return NULL;
                 }
-                buf3 = buf2[0];
-                buf2[0] = '\0';
-                buf1 = ostrcat(buf, NULL, 0, 0);
-                buf2[0] = buf3;
+                buf1 = strndup(buf, buf2 - buf);
                 if(buf1 == NULL)
                 {
-                        err("ostrcat failed");
+                        err("strndup failed");
                         return NULL;
                 }
@@ -5161 +5157 @@
                         }
                 }
-                buf3 = buf2[0];
-                buf2[0] = '\0';
-                buf1 = ostrcat(buf, NULL, 0, 0);
-                buf2[0] = buf3;
+                buf1 = strndup(buf, buf2 - buf);
                 if(buf1 == NULL)
                 {
-                        err("ostrcat failed");
+                        err("strndup failed");
                         return NULL;
                 }

titan/titan/skin.h

@@ -827 +827 @@
                         free(ret);
 
-                        if(getpic(newnode->pic) == NULL)
+                        if(getpic(newnode->pic) == NULL && newnode->pic != NULL)
                         {
                                 length = strlen(newnode->pic);