From 7a779ef6a2e8f7fa6bf0f5397061f052b7a70dbe Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Tue, 28 Jun 2011 17:50:56 +0100
Subject: [PATCH] Avoid referencing NULL pointer when copying stream error

* src/rpc/virnetclientstream.c: Avoid referencing NULL
---
 src/rpc/virnetclientstream.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 44c9acfe49..99c7b410b0 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -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;
 
-- 
GitLab