[PATCH] krnl386.exe16: pSeg might be NULL (Coverity)

Marcus Meissner marcus at jet.franken.de
Sun Jun 26 10:16:02 CDT 2011


Hi,

we pass in NULL here in one occasion, so check is necessary.
CID 2007

Ciao, Marcus
---
 dlls/krnl386.exe16/dosmem.c |    2 +-
 dlls/krnl386.exe16/global.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c
index 1f1815b..3a06d8a 100644
--- a/dlls/krnl386.exe16/dosmem.c
+++ b/dlls/krnl386.exe16/dosmem.c
@@ -480,7 +480,7 @@ LPVOID DOSMEM_AllocBlock(UINT size, UINT16* pseg)
     curr = DOSMEM_root_block;
     if (!(psp = DOSVM_psp)) psp = MCB_PSP_DOS;
 
-    *pseg = 0;
+    if (pseg) *pseg = 0;
 
     TRACE( "(%04xh)\n", size );
 
diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c
index 7f3807e..d9dcb1b 100644
--- a/dlls/krnl386.exe16/global.c
+++ b/dlls/krnl386.exe16/global.c
@@ -362,7 +362,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16(
             newptr = 0;
         else
         {
-            newptr = DOSMEM_AllocBlock( size, 0 );
+            newptr = DOSMEM_AllocBlock( size, NULL );
             if (newptr)
             {
                 memcpy( newptr, ptr, oldsize );
-- 
1.7.3.4




More information about the wine-patches mailing list