diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-10-03 08:28:43 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-10-03 08:28:43 +0000 |
| commit | a5b074c0ea25d8b3ec0ddf40292e6171ecb0791d (patch) | |
| tree | f75d5f7fba61147546a5965b22a869b4d27b40ac | |
| parent | f9eec9cac03c57c9240c7eae4bb45369f32f9c29 (diff) | |
| download | nautilus-a5b074c0ea25d8b3ec0ddf40292e6171ecb0791d.tar.gz | |
On assert failure, return default metadata, not NULL. Partial fix of
2005-10-03 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-directory-metafile.c:
(nautilus_directory_get_file_metadata):
On assert failure, return default metadata, not NULL.
Partial fix of #308977.
Patch from Christian Neumair.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory-metafile.c | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,13 @@ 2005-10-03 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/nautilus-directory-metafile.c: + (nautilus_directory_get_file_metadata): + On assert failure, return default metadata, not NULL. + Partial fix of #308977. + Patch from Christian Neumair. + +2005-10-03 Alexander Larsson <alexl@redhat.com> + * src/nautilus-window.c: Verify arguments in public functions. Patch from Christian Neumair. diff --git a/libnautilus-private/nautilus-directory-metafile.c b/libnautilus-private/nautilus-directory-metafile.c index f056962c0..840d96d66 100644 --- a/libnautilus-private/nautilus-directory-metafile.c +++ b/libnautilus-private/nautilus-directory-metafile.c @@ -192,9 +192,9 @@ nautilus_directory_get_file_metadata (NautilusDirectory *directory, const char *non_null_default; CORBA_char *corba_value; - g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL); - g_return_val_if_fail (!eel_str_is_empty (file_name), NULL); - g_return_val_if_fail (!eel_str_is_empty (key), NULL); + g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), g_strdup (default_metadata)); + g_return_val_if_fail (!eel_str_is_empty (file_name), g_strdup (default_metadata)); + g_return_val_if_fail (!eel_str_is_empty (key), g_strdup (default_metadata)); /* We can't pass NULL as a CORBA_string - pass "" instead. */ non_null_default = default_metadata != NULL ? default_metadata : ""; |