Lei Zhang : regedit: Check return values, don' t request unneeded value which always fails.

Alexandre Julliard julliard at winehq.org
Thu Oct 2 11:37:21 CDT 2008


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

Author: Lei Zhang <thestig at google.com>
Date:   Thu Oct  2 01:35:59 2008 -0700

regedit: Check return values, don't request unneeded value which always fails.

---

 programs/regedit/treeview.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c
index 6153a70..2b6f176 100644
--- a/programs/regedit/treeview.c
+++ b/programs/regedit/treeview.c
@@ -267,7 +267,10 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode,
             if ((mode & SEARCH_CONTENT) && (type == REG_EXPAND_SZ || type == REG_SZ)) {
                 LPWSTR buffer;
                 buffer = HeapAlloc(GetProcessHeap(), 0, lenValue);
-                RegEnumValueW(hKey, i, valName, &lenName, NULL, &type, (LPBYTE)buffer, &lenValue);
+                if (!buffer)
+                    break;
+                if (ERROR_SUCCESS != RegEnumValueW(hKey, i, NULL, NULL, NULL, &type, (LPBYTE)buffer, &lenValue))
+                    break;
                 if (match_string(buffer, sstring, mode)) {
                     HeapFree(GetProcessHeap(), 0, buffer);
                     RegCloseKey(hKey);




More information about the wine-cvs mailing list