Changeset 3539

Timestamp:

08/16/08 13:13:34 (4 months ago)

Author:

dgollub

Message:

1. osync_queue_connect can fail. It should be checked in the callback

connect.

2. Since digits is passed to sscanf, it might be uninitialized before

it is used. Initialize it and then check sscanf for errors.

3. Same thing with sscanf as above. But this time we error out if we

don't have a good month value.

Signed-off-by: Erik Hovland <erik@…>
Tested-by: Daniel Gollub <dgollub@…>

Location:

trunk/opensync

Files:

• client/opensync_client.c (modified) (1 diff)
• engine/opensync_mapping_engine.c (modified) (1 diff)
• format/opensync_time.c (modified) (5 diffs)

trunk/opensync/client/opensync_client.c

@@ -1419 +1419 @@
         
         /* We now connect to our incoming queue */
-        osync_queue_connect(client->incoming, OSYNC_QUEUE_RECEIVER, NULL);
+        if (!osync_queue_connect(client->incoming, OSYNC_QUEUE_RECEIVER, NULL))
+                return TRUE;
         
         return FALSE;

trunk/opensync/engine/opensync_mapping_engine.c

@@ -760 +760 @@
         
         if (osync_engine_check_get_changes(objengine->parent) && osync_bitcount(objengine->sink_errors | objengine->sink_get_changes) == g_list_length(objengine->sink_engines)) {
-                osync_obj_engine_command(objengine, OSYNC_ENGINE_COMMAND_WRITE, error);
+                if (!osync_obj_engine_command(objengine, OSYNC_ENGINE_COMMAND_WRITE, error))
+                        goto error;
         } else
                 osync_trace(TRACE_INTERNAL, "Not triggering write. didnt receive all reads yet");

trunk/opensync/format/opensync_time.c

@@ -953 +953 @@
         osync_trace(TRACE_ENTRY, "%s(%s)", __func__, alarm);
 
-        int i, secs, digits;
+        int i, secs, digits = 0;
         int is_digit = 0;
         int sign = 1;   // when ical stamp doesn't start with '-' => seconds after event
@@ -1000 +1000 @@
                                         break;
 
-                                sscanf((char*)(alarm+i),"%d",&digits);
+                                if (sscanf((char*)(alarm+i),"%d",&digits) == EOF)
+                                        return -1;
+
                                 is_digit = 1;
                                 break;
@@ -1142 +1144 @@
 struct tm *osync_time_dstchange(xmlNode *dstNode)
 {
-        int month;
+        int month = -1;
         struct tm *dst_change = NULL, *tm_started = NULL;
         char *started = NULL, *rule = NULL, *byday = NULL;
@@ -1160 +1162 @@
                 if (strstr(rule, "BYDAY="))
                         byday = g_strdup(rule + 6);
-                else if (strstr(rule, "BYMONTH="))
-                        sscanf(rule, "BYMONTH=%d", &month);
+                else if (strstr(rule, "BYMONTH=")) {
+                        if (sscanf(rule, "BYMONTH=%d", &month) == EOF)
+                                return NULL;
+                }
                 
                 xmlFree(rule);
@@ -1167 +1171 @@
                 current = current->next;
         }
+
+        if (month == -1)
+                return NULL;
 
         dst_change = osync_time_relative2tm(byday, month, tm_started->tm_year + 1900);