[stsf-commit] stsf/STClientLibrary/src serverconnection.c,1.7,1.8

[Jay Hobson]

Committed by: jhobson


Index: serverconnection.c
===================================================================
RCS file: /cvs/stsf/stsf/STClientLibrary/src/serverconnection.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/serverconnection.c	27 May 2004 04:26:52 -0000	1.7
+++ b/serverconnection.c	28 May 2004 18:13:26 -0000	1.8
@@ -643,9 +643,9 @@
     fsexchange3(FS_GETNAMESTRING_IN, s->fd, &s->doorbuf, &s->doorbufsize);
     if (ReceiveAndCheck(s, FS_GETNAMESTRING_OUT, &t)) return ST_PROTO_ERROR;
     q = (fsc_getnamestring_out *) s->protobuf;
-    if (q->count != 0) {
+    if (q->count != 0 && q->str ) {
         if ((*str = calloc(q->count, sizeof(byte))) != NULL) {
-            memcpy(str, q->str, q->count * sizeof(byte));
+            memcpy(*str, q->str, q->count * sizeof(byte));
         } else {
             t = ST_MEMORY;
         }
@@ -1521,7 +1521,7 @@
         if ((*oSignature = malloc(q->slen)) == NULL) {
             t = ST_MEMORY;
         } else {
-            memcpy(oSignature, q->signature, q->slen);
+            memcpy(*oSignature, q->signature, q->slen);
         }
     } else {
         *oSignature = NULL;