diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-03-04 16:10:13 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-03-04 16:10:44 +0100 |
| commit | 4912ee6c6a1d2e3277f1d6845fb9952d392dac70 (patch) | |
| tree | 916a0cb737e5ecb37a34ce2ac6abe29dfde66f2b | |
| parent | 0ba4073d055be461a6e161face5c3a419dfec6cd (diff) | |
| download | libgphoto2-4912ee6c6a1d2e3277f1d6845fb9952d392dac70.tar.gz | |
harden delete_recurse against non-existing folders (AFL)
| -rw-r--r-- | libgphoto2/gphoto2-filesys.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c index ad8b419e9..4d64550e8 100644 --- a/libgphoto2/gphoto2-filesys.c +++ b/libgphoto2/gphoto2-filesys.c @@ -483,7 +483,7 @@ recurse_delete_folder (CameraFilesystem *fs, CameraFilesystemFolder *folder) { recurse_delete_folder (fs, *f); delete_folder (fs, f); /* will also advance to next */ } - return (GP_OK); + return GP_OK; } static int @@ -500,6 +500,7 @@ delete_all_folders (CameraFilesystem *fs, const char *foldername, CA (foldername, context); folder = lookup_folder (fs, fs->rootfolder, foldername, context); + if (!folder) return GP_OK; return recurse_delete_folder (fs, folder); } |