From: John Ferlan <jferlan@redhat.com>
Date: Tue, 19 Sep 2017 12:55:43 +0000 (-0400)
Subject: conf: Fix prototype/definition for virStoragePoolObj get functions
X-Git-Tag: CVE-2017-1000256~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee5498304f1b0191969625326f33c5506a77c61f;p=thirdparty%2Flibvirt.git

conf: Fix prototype/definition for virStoragePoolObj get functions

Modify virStoragePoolObjGetAutostartLink and
virStoragePoolObjGetConfigFile to return "const char *"
since that's how both are used and to ensure no one
tries to VIR_FREE the result.
---

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 1364bddd15..ff04c9efe4 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -89,7 +89,7 @@ virStoragePoolObjDefUseNewDef(virStoragePoolObjPtr obj)
 }
 
 
-char *
+const char *
 virStoragePoolObjGetConfigFile(virStoragePoolObjPtr obj)
 {
     return obj->configFile;
@@ -105,7 +105,7 @@ virStoragePoolObjSetConfigFile(virStoragePoolObjPtr obj,
 }
 
 
-char *
+const char *
 virStoragePoolObjGetAutostartLink(virStoragePoolObjPtr obj)
 {
     return obj->autostartLink;
diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h
index b65b16019c..cf7ee06cd1 100644
--- a/src/conf/virstorageobj.h
+++ b/src/conf/virstorageobj.h
@@ -86,14 +86,14 @@ virStoragePoolObjGetNewDef(virStoragePoolObjPtr obj);
 void
 virStoragePoolObjDefUseNewDef(virStoragePoolObjPtr obj);
 
-char *
+const char *
 virStoragePoolObjGetConfigFile(virStoragePoolObjPtr obj);
 
 void
 virStoragePoolObjSetConfigFile(virStoragePoolObjPtr obj,
                                char *configFile);
 
-char *
+const char *
 virStoragePoolObjGetAutostartLink(virStoragePoolObjPtr obj);
 
 bool