X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccore%2Fsilccommand.c;h=04f03d6b6a6d1acc02fcbd7e4c22cc50cb6f24fc;hb=386c883d8774999c6e74d7c6c37e52e4163a4cb1;hp=e1c2fc2bf1fe3a6a9e6db0677c74be1516ed9799;hpb=7428855aff83c6dd40431bb88d3f1e5c973e7c06;p=silc.git

diff --git a/lib/silccore/silccommand.c b/lib/silccore/silccommand.c
index e1c2fc2b..04f03d6b 100644
--- a/lib/silccore/silccommand.c
+++ b/lib/silccore/silccommand.c
@@ -207,31 +207,32 @@ SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd,
 					   uint16 ident, 
 					   uint32 argc, va_list ap)
 {
-  unsigned char **argv;
+  unsigned char **argv = NULL;
   uint32 *argv_lens = NULL, *argv_types = NULL;
   unsigned char *x;
   uint32 x_len;
   uint32 x_type;
   SilcBuffer buffer;
-  int i, k;
-
-  argv = silc_calloc(argc, sizeof(unsigned char *));
-  argv_lens = silc_calloc(argc, sizeof(uint32));
-  argv_types = silc_calloc(argc, sizeof(uint32));
-
-  for (i = 0, k = 0; i < argc; i++) {
-    x_type = va_arg(ap, uint32);
-    x = va_arg(ap, unsigned char *);
-    x_len = va_arg(ap, uint32);
+  int i, k = 0;
 
-    if (!x_type || !x || !x_len)
-      continue;
-
-    argv[k] = silc_calloc(x_len + 1, sizeof(unsigned char));
-    memcpy(argv[k], x, x_len);
-    argv_lens[k] = x_len;
-    argv_types[k] = x_type;
-    k++;
+  if (argc) {
+    argv = silc_calloc(argc, sizeof(unsigned char *));
+    argv_lens = silc_calloc(argc, sizeof(uint32));
+    argv_types = silc_calloc(argc, sizeof(uint32));
+
+    for (i = 0, k = 0; i < argc; i++) {
+      x_type = va_arg(ap, uint32);
+      x = va_arg(ap, unsigned char *);
+      x_len = va_arg(ap, uint32);
+      
+      if (!x_type || !x || !x_len)
+	continue;
+      
+      argv[k] = silc_memdup(x, x_len);
+      argv_lens[k] = x_len;
+      argv_types[k] = x_type;
+      k++;
+    }
   }
 
   buffer = silc_command_payload_encode(cmd, k, argv, argv_lens, 
@@ -288,8 +289,7 @@ silc_command_reply_payload_encode_vap(SilcCommand cmd,
   argv_types = silc_calloc(argc, sizeof(uint32));
 
   SILC_PUT16_MSB(status, status_data);
-  argv[0] = silc_calloc(sizeof(status_data) + 1, sizeof(unsigned char));
-  memcpy(argv[0], status_data, sizeof(status_data));
+  argv[0] = silc_memdup(status_data, sizeof(status_data));
   argv_lens[0] = sizeof(status_data);
   argv_types[0] = 1;
 
@@ -301,8 +301,7 @@ silc_command_reply_payload_encode_vap(SilcCommand cmd,
     if (!x_type || !x || !x_len)
       continue;
 
-    argv[k] = silc_calloc(x_len + 1, sizeof(unsigned char));
-    memcpy(argv[k], x, x_len);
+    argv[k] = silc_memdup(x, x_len);
     argv_lens[k] = x_len;
     argv_types[k] = x_type;
     k++;