From 814d92d56ca5ac08eeca285c9fe5cbc4c8a6f68b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 9 Sep 2012 20:39:53 +0530
Subject: [PATCH] ...

---
 src/calibre/utils/windows/winutil.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/calibre/utils/windows/winutil.c b/src/calibre/utils/windows/winutil.c
index c00bcc4b41..384e2d1e28 100644
--- a/src/calibre/utils/windows/winutil.c
+++ b/src/calibre/utils/windows/winutil.c
@@ -199,9 +199,8 @@ get_registry_property(HDEVINFO hDevInfo, DWORD index, DWORD property, BOOL *iter
                 if (buffer != NULL) { PyMem_Free(buffer); buffer = NULL; }
                 buffer = (LPWSTR)PyMem_Malloc(2*buffersize); // Twice for bug in Win2k
             } else {
-            	PyMem_Free(buffer);
+                if (buffer != NULL) { PyMem_Free(buffer); buffer = NULL; }
             	PyErr_SetFromWindowsErr(0);
-                buffer = NULL;
                 break;
             }
     } //while