diff options
| author | Christian Dywan <christian.dywan@lanedo.com> | 2011-01-17 12:02:22 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-01-17 12:02:30 +0000 |
| commit | 0f67e863082a0b99c444003ec40b57ac6b8c313d (patch) | |
| tree | a4b19167279f0201ad0957819f339d0fd6bde5ed /bus/dir-watch-inotify.c | |
| parent | 85cb8414ff268459f2d8350d3f3dd4bb9970badf (diff) | |
| download | dbus-0f67e863082a0b99c444003ec40b57ac6b8c313d.tar.gz | |
handle failure to register inotify shutdown function
Origin: vendor, Maemo
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33128
Bug-NB: NB#180486
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'bus/dir-watch-inotify.c')
| -rw-r--r-- | bus/dir-watch-inotify.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c index 39eff974..461b8ee3 100644 --- a/bus/dir-watch-inotify.c +++ b/bus/dir-watch-inotify.c @@ -259,7 +259,13 @@ _init_inotify (BusContext *context) goto out; } - _dbus_register_shutdown_func (_shutdown_inotify, NULL); + if (!_dbus_register_shutdown_func (_shutdown_inotify, NULL)) + { + _dbus_warn ("Unable to register shutdown func"); + _dbus_watch_unref (watch); + watch = NULL; + goto out; + } } ret = 1; |