nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-05-30 16:30:29 -05:00
Code Issues Projects Releases Wiki Activity

Windows open_settings_r: return NULL for a nonexistent session.

Browse Source 
Previously, we returned a valid settings_r containing a null HKEY.
That didn't actually cause trouble (I think all the registry API
functions must have spotted the null HKEY and returned a clean error
code instead of crashing), but it means the caller can't tell if the
session really existed or not. Now we return NULL in that situation,
and close_settings_r avoids crashing if we pass the NULL to it later.
This commit is contained in:
Simon Tatham 2019-02-27 20:29:13 +00:00
parent 1db5001260
commit 69b216c116
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
windows/winstore.c
View File

@ -113,6 +113,9 @@ settings_r *open_settings_r(const char *sessionname)
strbuf_free(sb); strbuf_free(sb);
if (!sesskey)
return NULL;
settings_r *toret = snew(settings_r); settings_r *toret = snew(settings_r);
toret->sesskey = sesskey; toret->sesskey = sesskey;
return toret; return toret;
@ -237,8 +240,10 @@ void write_setting_filename(settings_w *handle,
void close_settings_r(settings_r *handle) void close_settings_r(settings_r *handle)
{ {
RegCloseKey(handle->sesskey); if (handle) {
sfree(handle); RegCloseKey(handle->sesskey);
sfree(handle);
}
} }
void del_settings(const char *sessionname) void del_settings(const char *sessionname)