Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

shellext: verify return value of RegQueryValue

Changeset 584959f5851d…

Parent 562b60ad63ce…

by Henrik Stuart

Changes to one file · Browse files at 584959f5851d Showing diff from parent 562b60ad63ce Diff from another changeset...

Change 1 of 2 Show Entire File win32/​shellext/​TortoiseUtils.cpp Stacked
 
69
70
71
72
73
74
 
 
 
 
75
76
77
 
82
83
84
85
86
87
 
 
 
 
88
89
90
 
69
70
71
 
 
 
72
73
74
75
76
77
78
 
83
84
85
 
 
 
86
87
88
89
90
91
92
@@ -69,9 +69,10 @@
  TCHAR lpszValue[MAX_PATH] = "";   LONG lpcbLonger = MAX_PATH * sizeof(TCHAR);   - RegQueryValue(key, regname, lpszValue, &lpcbLonger); - std::string result(reinterpret_cast<char*>(lpszValue)); - return result; + if (RegQueryValue(key, regname, lpszValue, &lpcbLonger) != ERROR_SUCCESS) + return ""; + + return lpszValue;  }     @@ -82,9 +83,10 @@
  TCHAR lpszValue[MAX_PATH] = "";   LONG lpcbLonger = MAX_PATH * sizeof(TCHAR);   - RegQueryValue(key, regname, lpszValue, &lpcbLonger); - std::string result(reinterpret_cast<char*>(lpszValue)); - return result; + if (RegQueryValue(key, regname, lpszValue, &lpcbLonger) != ERROR_SUCCESS) + return ""; + + return lpszValue;  }