msxml3: Properly store SystemID and PublicID (Coverity)

Nikolay Sivov nsivov at codeweavers.com
Wed Nov 28 05:59:05 CST 2012


CID 713861 and 713862
-------------- next part --------------
>From f41117cd6b32153d20766b6dbda0f0b12e18e71d Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed, 28 Nov 2012 12:45:12 -0500
Subject: [PATCH 3/7] Properly store SystemID and PublicID (Coverity)

---
 dlls/msxml3/saxreader.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index 877493d..3b167b7 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -294,8 +294,8 @@ typedef struct
     saxreader *saxreader;
     HRESULT ret;
     xmlParserCtxtPtr pParserCtxt;
-    WCHAR *publicId;
-    WCHAR *systemId;
+    BSTR publicId;
+    BSTR systemId;
     int line;
     int column;
     BOOL vbInterface;
@@ -2132,7 +2132,7 @@ static HRESULT WINAPI isaxlocator_getPublicId(
 
     publicId = bstr_from_xmlChar(xmlSAX2GetPublicId(This->pParserCtxt));
     if(SysStringLen(publicId))
-        This->publicId = (WCHAR*)&publicId;
+        This->publicId = publicId;
     else
     {
         SysFreeString(publicId);
@@ -2154,7 +2154,7 @@ static HRESULT WINAPI isaxlocator_getSystemId(
 
     systemId = bstr_from_xmlChar(xmlSAX2GetSystemId(This->pParserCtxt));
     if(SysStringLen(systemId))
-        This->systemId = (WCHAR*)&systemId;
+        This->systemId = systemId;
     else
     {
         SysFreeString(systemId);
-- 
1.7.10.4




More information about the wine-patches mailing list