diff options
| author | Simon McVittie <smcv@collabora.com> | 2024-01-29 13:54:19 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2024-01-29 13:54:19 +0000 |
| commit | 6c31c381e29c7e8e340fb7ee2fd50e04008ad230 (patch) | |
| tree | 7cd378c6c27285e724fc66f8c96781ba247a8f02 | |
| parent | 00449e75434c9c6042e00303fe61a10040024164 (diff) | |
| parent | c3b1e4daa5b0ed5729f0f12bc6a3ba50a391f7f6 (diff) | |
Merge branch 'master' into 'master'
bus/dir-watch:Do not crash when reloading configuration with > 128 dirs
Closes #481
See merge request dbus/dbus!453
| -rw-r--r-- | bus/dir-watch-inotify.c | 4 | ||||
| -rw-r--r-- | bus/dir-watch-kqueue.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c index 77b2d5a9..4f269777 100644 --- a/bus/dir-watch-inotify.c +++ b/bus/dir-watch-inotify.c @@ -131,7 +131,7 @@ _set_watched_dirs_internal (BusContext *context, /* Look for directories in both the old and new sets, if * we find one, move its data into the new set. */ - for (i = 0; new_dirs[i]; i++) + for (i = 0; i < MAX_DIRS_TO_WATCH && new_dirs[i]; i++) { for (j = 0; j < num_wds; j++) { @@ -160,7 +160,7 @@ _set_watched_dirs_internal (BusContext *context, } } - for (i = 0; new_dirs[i]; i++) + for (i = 0; i < MAX_DIRS_TO_WATCH && new_dirs[i]; i++) { if (new_wds[i] == -1) { diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c index b419606e..07b505c9 100644 --- a/bus/dir-watch-kqueue.c +++ b/bus/dir-watch-kqueue.c @@ -235,7 +235,7 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories) /* Look for directories in both the old and new sets, if * we find one, move its data into the new set. */ - for (i = 0; new_dirs[i]; i++) + for (i = 0; i < MAX_DIRS_TO_WATCH && new_dirs[i]; i++) { for (j = 0; j < num_fds; j++) { @@ -264,7 +264,7 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories) } } - for (i = 0; new_dirs[i]; i++) + for (i = 0; i < MAX_DIRS_TO_WATCH && new_dirs[i]; i++) { if (new_fds[i] == -1) { |