Changeset 500

Timestamp:

Sep 1, 2014, 9:30:41 AM (10 years ago)

Author:

djay

Message:

Fix issue reported on mailing list about base64 encoding.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -1913 +1913 @@
 
         xmlAddChild(nc3,xmlNewText(BAD_CAST base64(tmp3->value, atoi(rs->value))));
+        if(tmp1==NULL || (tmp1!=NULL && strncmp(tmp1->value,"base64",6)!=0))
+          xmlNewProp(nc3,BAD_CAST "encoding",BAD_CAST "base64");
         if(!isSized){
           freeMap(&rs);
@@ -2305 +2307 @@
         free(file_name);
         free(file_url); 
-      }
+        }
 #ifdef USE_MS
       else{
@@ -2420 +2422 @@
   bmem = BIO_new(BIO_s_mem());
   b64 = BIO_push(b64, bmem);
-  BIO_write(b64, input, length);
+  BIO_write(b64, input, length+1);
   BIO_flush(b64);
   BIO_get_mem_ptr(b64, &bptr);
 
-  char *buff = (char *)malloc((bptr->length)*sizeof(char));
-  memcpy(buff, bptr->data, bptr->length-1);
+  char *buff = (char *)malloc((bptr->length+1)*sizeof(char));
+  memcpy(buff, bptr->data, bptr->length);
   buff[bptr->length-1] = 0;