Hans Leidekker : msi: Avoid dereferencing a NULL pointer (clang).

Alexandre Julliard julliard at winehq.org
Thu Jul 7 13:33:45 CDT 2011


Module: wine
Branch: master
Commit: 540d18906027db67e192526fff584527abc69e86
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=540d18906027db67e192526fff584527abc69e86

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Thu Jul  7 09:22:59 2011 +0200

msi: Avoid dereferencing a NULL pointer (clang).

---

 dlls/msi/assembly.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c
index 806f89e..fd1f952 100644
--- a/dlls/msi/assembly.c
+++ b/dlls/msi/assembly.c
@@ -247,8 +247,11 @@ static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSI
 
 done:
     msiobj_release( &view->hdr );
-    for (i = 0; i < name.count; i++) msi_free( name.attrs[i] );
-    msi_free( name.attrs );
+    if (name.attrs)
+    {
+        for (i = 0; i < name.count; i++) msi_free( name.attrs[i] );
+        msi_free( name.attrs );
+    }
     return display_name;
 }
 




More information about the wine-cvs mailing list