summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--libnautilus-private/nautilus-module.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ac8c4f758..e8c046519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-08-24 Alexander Larsson <alexl@redhat.com>
+ * libnautilus-private/nautilus-module.c:
+ Be more robust against broken extensions (#449488)
+
+2007-08-24 Alexander Larsson <alexl@redhat.com>
+
* libnautilus-private/nautilus-file-utilities.c:
* libnautilus-private/nautilus-file.c:
Avoid crashing if going to file:///# (#436071)
diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
index 169c5116a..6a0dbd674 100644
--- a/libnautilus-private/nautilus-module.c
+++ b/libnautilus-private/nautilus-module.c
@@ -158,6 +158,9 @@ add_module_objects (NautilusModule *module)
module->list_types (&types, &num_types);
for (i = 0; i < num_types; i++) {
+ if (types[i] == 0) { /* Work around broken extensions */
+ break;
+ }
nautilus_module_add_type (types[i]);
}
}