Merge lp:~charlesk/indicator-datetime/fix-943747 into lp:indicator-datetime/0.4

[Charles Kerr]

The Coverity warning about sscanf() seems to be that humans need to verify that there won't be a buffer overrun from scanning into a char array. I've done so and added comments to Coverity to silence the warning.

I'm not 100% sure about the use of /* coverity[secure_coding] */ but it appears this is how other projects, such as libinktomi++, do it.

[Ted Gould (ted)]

On Sun, 2012-03-04 at 01:00 +0000, charles wrote:
> I'm not 100% sure about the use of /* coverity[secure_coding] */ but
> it appears this is how other projects, such as libinktomi++, do it.

Me neither, let's try it.

  review approve
  status approved

review: Approve

[Charles Kerr (charlesk)]

Allan reports that it works :)

=== modified file 'src/datetime-prefs.c'
--- src/datetime-prefs.c	2012-03-02 03:15:35 +0000
+++ src/datetime-prefs.c	2012-03-04 00:59:18 +0000
@@ -405,6 +405,7 @@
     if (is_locale_12h ()) { // TODO: make this look-at/watch gsettings?
       char ampm[51];
 
+      /* coverity[secure_coding] */
       scanned = sscanf (text, "%u:%u:%u %50s", &hour_in, &minute_in, &second_in, ampm);
       passed = (scanned == 4);
 
@@ -415,6 +416,7 @@
         }
       }
     } else {
+      /* coverity[secure_coding] */
       scanned = sscanf (text, "%u:%u:%u", &hour_in, &minute_in, &second_in);
       passed = (scanned == 3);
     }
@@ -433,6 +435,7 @@
   else {
     gint year_in, month_in, day_in;
 
+    /* coverity[secure_coding] */
     scanned = sscanf (text, "%u-%u-%u", &year_in, &month_in, &day_in);
 
     if (scanned != 3 || year_in < 1 || year_in > 9999 ||