Changeset 229

Timestamp:

Jun 9, 2011, 2:51:57 PM (13 years ago)

Author:

djay

Message:

Remove the '<' char supported in zcfg. Fixing dupMaps memory allocation size. Many thanks to Luca Delucchi for pointing us to this issue.

Location:

trunk/zoo-kernel

Files:

• service.h (modified) (1 diff)
• service_conf.l (modified) (1 diff)

trunk/zoo-kernel/service.h

@@ -549 +549 @@
         map* tmpV=getMap(res->content,"value");
         free(tmpV->value);
-        tmpV->value=(char*)malloc(atoi(tmp->value)*sizeof(char));
+        tmpV->value=(char*)malloc((atoi(tmp->value)+1)*sizeof(char));
         memmove(tmpV->value,tmpSized,atoi(tmp->value)*sizeof(char));
+        tmpV->value[atoi(tmp->value)]=0;
         free(tmpSized);
       }

trunk/zoo-kernel/service_conf.l

@@ -41 +41 @@
 
 attname [a-zA-Z0-9_\-]+
-attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|$><&]+
+attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|\$\&>]+
 
 attvalue                \"[^"]*\"|\'[^']*\'\(\)