Changeset be5aa09 for util.c

Timestamp:

Feb 23, 2007, 3:12:49 PM (18 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

59916e8

Parents:

1cc95709

Message:

Fixing a bug reported over zephyr in which narrowing would permanently
break replies due to in-place string manipulation.

owl_util_baseclass now returns a new string, which must be freed by
the caller.

File:

• util.c (modified) (1 diff)

util.c

@@ -739 +739 @@
 /* Return the base class or instance from a zephyr class, by removing
    leading `un' or trailing `.d'.
-   Modified ``class'' in place, and does not allocate memory.
+   The caller is responsible for freeing the allocated string.
 */
 char * owl_util_baseclass(char * class)
 {
+  char * newClass;
   char * end;
-  while(!strncmp(class, "un", 2)) {
-    class += 2;
-  }
-  end = class + strlen(class) - 1;
+  newClass = owl_strdup(class);
+  while(!strncmp(newClass, "un", 2)) {
+    newClass += 2;
+  }
+  end = newClass + strlen(newClass) - 1;
   while(*end == 'd' && *(end-1) == '.') {
     end -= 2;
   }
   *(end + 1) = 0;
-  return class;
+  return newClass;
 }