evolution r36237 - in trunk/addressbook: . gui/widgets

[msuman svn gnome org]

Author: msuman
Date: Mon Sep  1 04:00:00 2008
New Revision: 36237
URL: http://svn.gnome.org/viewvc/evolution?rev=36237&view=rev

Log:
Milan Crha  <mcrha redhat com> ** Part of fix for bug #548827 (Check bounds of the string array before accessing elements, show more detailed error message if available).

Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/widgets/e-addressbook-view.c
   trunk/addressbook/gui/widgets/eab-gui-util.c

Modified: trunk/addressbook/gui/widgets/e-addressbook-view.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-addressbook-view.c	(original)
+++ trunk/addressbook/gui/widgets/e-addressbook-view.c	Mon Sep  1 04:00:00 2008
@@ -1731,7 +1731,7 @@
 			break;
 	  	default :
 			/* Unknown error */
-			e_error_run (NULL, "addressbook:generic-error", _("Failed to delete contact"), _("Other error"), NULL);
+			eab_error_dialog (_("Failed to delete contact"), status);
 			break;
 	}
 }

Modified: trunk/addressbook/gui/widgets/eab-gui-util.c
==============================================================================
--- trunk/addressbook/gui/widgets/eab-gui-util.c	(original)
+++ trunk/addressbook/gui/widgets/eab-gui-util.c	Mon Sep  1 04:00:00 2008
@@ -82,7 +82,12 @@
 void
 eab_error_dialog (const char *msg, EBookStatus status)
 {
-	const char *status_str = status_to_string [status];
+	const char *status_str;
+
+	if (status < 0 || status >= G_N_ELEMENTS (status_to_string))
+		status_str = "Other error";
+	else
+		status_str = status_to_string [status];
 
 	if (status_str)
 		e_error_run (NULL, "addressbook:generic-error", msg, _(status_str), NULL);