From: Sergio Villar Senin <svillar@igalia.com>
Date: Tue, 15 Sep 2009 17:37:09 +0000 (+0200)
Subject: alarmd_event_query() returns a zero terminated array. The problem was added in
X-Git-Tag: 3.0.17-rc56~2
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=9fe01883c7e464bdc2ca676bc5b2afc41ce4a0b7

alarmd_event_query() returns a zero terminated array. The problem was added in
commit 3706ebbbd99bd8a93f09ed333aa57fe58b537c5d

This completes the fix for 114184.
---

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 563c347..f926ba8 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -1506,7 +1506,8 @@ modest_platform_set_update_interval (guint minutes)
 	/* Delete any existing alarm, because we will replace it: */
 	alarm_cookies = alarmd_event_query (0,0, 0,0, MODEST_ALARMD_APPID);
 	if (alarm_cookies) {
-		for (; alarm_cookies != NULL; alarm_cookies++) {
+		/* alarmd_event_query returns a zero terminated array */
+		for (; *alarm_cookies != 0; alarm_cookies++) {
 			alarmd_event_del (*alarm_cookies);
 		}
 		modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL);