github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 15:16:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add locking to try_complete_user

Browse Source 
This uses the thread-unsafe getpwent(). Add a lock around the whole section
to avoid the crash identified in #5088
This commit is contained in:
ridiculousfish 2018-07-15 15:50:56 -07:00
parent c5ec7daab4
commit c636a455a0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/complete.cpp
View File

@ -40,6 +40,7 @@
#include "parser.h"
#include "path.h"
#include "proc.h"
#include "reader.h"
#include "tnode.h"
#include "util.h"
#include "wildcard.h"
@ -1226,13 +1227,17 @@ bool completer_t::try_complete_user(const wcstring &str) {
bool result = false;
size_t name_len = wcslen(user_name);
// We don't bother with the thread-safe `getpwent_r()` variant because it isn't needed. This is
// only run in a completion context and thus will only be called from a single thread and there
// is no place else in fish where we call `getpwent()`.
struct passwd *pw;
// We don't bother with the thread-safe `getpwent_r()` variant because this is the sole place
// where we call getpwent().
static fish_mutex_t lock;
scoped_lock locker(lock);
setpwent();
// cppcheck-suppress getpwentCalled
while ((pw = getpwent()) != NULL) {
while (struct passwd *pw = getpwent()) {
bool interrupted = is_main_thread() ? reader_interrupted() : reader_thread_job_is_stale();
if (interrupted) {
break;
}
const wcstring pw_name_str = str2wcstring(pw->pw_name);
const wchar_t *pw_name = pw_name_str.c_str();
if (wcsncmp(user_name, pw_name, name_len) == 0) {