]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Avoid referencing NULL pointer when copying stream error
authorDaniel P. Berrange <berrange@redhat.com>
Tue, 28 Jun 2011 16:50:56 +0000 (17:50 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Wed, 29 Jun 2011 10:08:59 +0000 (11:08 +0100)
* src/rpc/virnetclientstream.c: Avoid referencing NULL

src/rpc/virnetclientstream.c

index 44c9acfe49e82addd55a82574389a704f9c3a8e8..99c7b410b007f2f6b1054acab7d27f786d86d735 100644 (file)
@@ -217,13 +217,24 @@ int virNetClientStreamSetError(virNetClientStreamPtr st,
     } else {
         st->err.code = err.code;
     }
-    st->err.message = *err.message;
-    *err.message = NULL;
+    if (err.message) {
+        st->err.message = *err.message;
+        *err.message = NULL;
+    }
     st->err.domain = err.domain;
     st->err.level = err.level;
-    st->err.str1 = *err.str1;
-    st->err.str2 = *err.str2;
-    st->err.str3 = *err.str3;
+    if (err.str1) {
+        st->err.str1 = *err.str1;
+        *err.str1 = NULL;
+    }
+    if (err.str2) {
+        st->err.str2 = *err.str2;
+        *err.str2 = NULL;
+    }
+    if (err.str3) {
+        st->err.str3 = *err.str3;
+        *err.str3 = NULL;
+    }
     st->err.int1 = err.int1;
     st->err.int2 = err.int2;