diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2008-03-07 13:26:48 +0000 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@src.gnome.org> | 2008-03-07 13:26:48 +0000 |
| commit | 05165ece2c64b66e8e38fa03b30a8b57e91fe48e (patch) | |
| tree | 98273a157eedecde40466efe01b9538dee8b1bfd | |
| parent | 5aa5cdc7d3385a81d7d24cf06a42097a8179690a (diff) | |
| download | nautilus-05165ece2c64b66e8e38fa03b30a8b57e91fe48e.tar.gz | |
Fix a crash due to a missing NULL check (#520947).
2008-03-07 Cosimo Cecchi <cosimoc@gnome.org>
* libnautilus-private/nautilus-file-operations.c:
(callback_for_move_to_trash):
Fix a crash due to a missing NULL check (#520947).
svn path=/trunk/; revision=13897
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2008-03-07 Cosimo Cecchi <cosimoc@gnome.org> + + * libnautilus-private/nautilus-file-operations.c: + (callback_for_move_to_trash): + Fix a crash due to a missing NULL check (#520947). + 2008-03-06 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-bookmark.c: diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index c9d91e3b5..4844aa69e 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -4568,7 +4568,8 @@ callback_for_move_to_trash (GHashTable *debuting_uris, gboolean user_cancelled, MoveTrashCBData *data) { - data->real_callback (debuting_uris, data->real_data); + if (data->real_callback) + data->real_callback (debuting_uris, data->real_data); g_slice_free (MoveTrashCBData, data); } |