[PATCH] winspool.drv: check ptr for being NULL (Coverity)

Marcus Meissner marcus at jet.franken.de
Thu Dec 3 03:18:19 CST 2009


Hi,

Also check ptr for being NULL before converting.

Ciao, Marcus
---
 dlls/winspool.drv/info.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index ad99988..8e4d714 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -3337,7 +3337,7 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName,
     if (ptr && ((DEVMODEA*)ptr)->dmSize < sizeof(DEVMODEA))
         ((DEVMODEA*)ptr)->dmSize = sizeof(DEVMODEA);
     sz += (CCHDEVICENAME + CCHFORMNAME);
-    if(buflen >= sz) {
+    if (ptr && (buflen >= sz)) {
         DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr);
         memcpy(ptr, dmW, sz);
         HeapFree(GetProcessHeap(),0,dmW);
-- 
1.5.6



More information about the wine-patches mailing list