mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-19 03:51:02 -05:00
Make get_user_sid() return the cached copy if one already exists.
A user reported in January that locking down our process ACL causes get_user_sid's call to OpenProcessToken to fail with a permissions error. This _shouldn't_ be important, because we'll already have found and cached the user SID before getting that far - but unfortunately the call to get_user_sid in winnpc.c was bypassing the cache and trying the whole process again. This fix changes the memory ownership semantics of get_user_sid(): it's now an error to free the value it gives you, or else the *next* call to get_user_sid() will return a stale pointer. Hence, also removed those frees everywhere they appear.
This commit is contained in:
@ -79,7 +79,6 @@ Socket new_named_pipe_client(const char *pipename, Plug plug)
|
||||
ret = new_error_socket(err, plug);
|
||||
sfree(err);
|
||||
CloseHandle(pipehandle);
|
||||
sfree(usersid);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -89,12 +88,10 @@ Socket new_named_pipe_client(const char *pipename, Plug plug)
|
||||
sfree(err);
|
||||
CloseHandle(pipehandle);
|
||||
LocalFree(psd);
|
||||
sfree(usersid);
|
||||
return ret;
|
||||
}
|
||||
|
||||
LocalFree(psd);
|
||||
sfree(usersid);
|
||||
|
||||
return make_handle_socket(pipehandle, pipehandle, plug, TRUE);
|
||||
}
|
||||
|
Reference in New Issue
Block a user