Changeset 04b2b17e96842aca30ef97ef450e486f446206d3

Timestamp:

11/13/10 14:02:20 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

3752081d1de2bd77d8bc7fb35ebfb0919b8de5e6

Parents:

c0240447c1f018bcb69fceaf073a43ed8e304e8a

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-13T14:02:20Z+0200

Message:

ladishd: project name unescaping

Files:

• daemon/room_load.c (modified) (4 diffs)

daemon/room_load.c

@@ -77 +77 @@
   uint32_t port_type;
   uint32_t port_flags;
+  size_t len;
 
   if (context_ptr->error)
@@ -101 +102 @@
     }
 
-    log_info("Project '%s' with uuid %s", name, uuid_str);
-
-    room_ptr->project_name = strdup(name);
+    len = strlen(name) + 1;
+    room_ptr->project_name = malloc(len);
     if (room_ptr->project_name == NULL)
     {
-      log_error("strdup() failed for project name");
-      context_ptr->error = XML_TRUE;
-      return;
-    }
+      log_error("malloc() failed for project name with length %zu", len);
+      context_ptr->error = XML_TRUE;
+      return;
+    }
+
+    room_ptr->project_name[unescape(name, len, room_ptr->project_name)] = 0;
+
+    log_info("Project '%s' with uuid %s", room_ptr->project_name, uuid_str);
 
     uuid_copy(room_ptr->project_uuid, uuid);
@@ -780 +784 @@
   const char * uuid_str;
   uuid_t uuid;
+  size_t len;
 
   if (strcmp(el, "project") == 0)
@@ -785 +790 @@
     if (ladish_get_name_and_uuid_attributes("/project", attr, &name, &uuid_str, uuid))
     {
-      context_ptr->str = strdup(name);
+      len = strlen(name) + 1;
+      context_ptr->str = malloc(len);
       if (context_ptr->str == NULL)
       {
-        log_error("strdup() failed for project name");
-      }
+        log_error("malloc() failed for project name with length %zu", len);
+      }
+
+      context_ptr->str[unescape(name, len, context_ptr->str)] = 0;
     }