Merge lp:~jamesodhunt/libnih/strchr-fixes into lp:libnih

[James Hunt]

      * nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c
        (test_unix_fd_to_str): Sanity check value before invoking strchr in
        case it returns address of null (which would give a misleading test
        pass).
      * nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c
        (test_unix_fd_to_str, test_unix_fd_to_str_sync): Sanity check value
        before invoking strchr in case it returns address of null (which would
        give a misleading test pass).
      * nih/config.c (): nih_config_block_end: Add check to ensure strchr()
        doesn't return address of null since this would result in a misleading
        return value of TRUE.

[James Hunt (jamesodhunt)]

Hi Scott,

Regarding the comments on: https://code.launchpad.net/~jamesodhunt/libnih/fix-for-bug-834813/+merge/73383 wrt existing strchr usage, these were the only instances of strchr() I could find that could return bogus values.

Cheers,

James.

=== modified file 'ChangeLog'
--- ChangeLog	2011-08-26 18:31:43 +0000
+++ ChangeLog	2011-08-30 19:25:14 +0000
@@ -1,3 +1,17 @@
[phone]  James Hunt  <[e-mail]>
+
+	* nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c
+	  (test_unix_fd_to_str): Sanity check value before invoking strchr in
+	  case it returns address of null (which would give a misleading test
+	  pass).
+	* nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c
+	  (test_unix_fd_to_str, test_unix_fd_to_str_sync): Sanity check value
+	  before invoking strchr in case it returns address of null (which would
+	  give a misleading test pass).
+	* nih/config.c (): nih_config_block_end: Add check to ensure strchr()
+	  doesn't return address of null since this would result in a misleading
+	  return value of TRUE.
+
 2011-08-26  James Hunt  <[e-mail]>
 
 	* nih/io.c (nih_io_select_fds): Ensure number of fds being managed
 
=== modified file 'nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c'
--- nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c	2010-12-23 21:48:04 +0000
+++ nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c	2011-08-30 19:25:14 +0000
@@ -12524,6 +12524,7 @@
 		dbus_message_iter_init (reply, &iter);
 
 		dbus_message_iter_get_basic (&iter, &str_value);
+		TEST_NE (str_value[0], '\0');
 		TEST_TRUE (strchr ("0123456789", str_value[0]));
 
 		dbus_message_unref (reply);
 
=== modified file 'nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c'
--- nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c	2010-12-23 21:48:04 +0000
+++ nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c	2011-08-30 19:25:14 +0000
@@ -27359,6 +27359,7 @@
 		TEST_TRUE (unix_fd_to_str_replied);
 
 		TEST_EQ_P (last_data, parent);
+		TEST_NE (last_str_value[0], '\0');
 		TEST_TRUE (strchr ("0123456789", last_str_value[0]));
 		TEST_ALLOC_PARENT (last_str_value, parent);
 
@@ -27673,6 +27674,7 @@
 
 		TEST_EQ (ret, 0);
 
+		TEST_NE (str_value[0], '\0');
 		TEST_TRUE (strchr ("0123456789", str_value[0]));
 		TEST_ALLOC_PARENT (str_value, parent);
 
 
=== modified file 'nih/config.c'
--- nih/config.c	2011-08-26 18:28:37 +0000
+++ nih/config.c	2011-08-30 19:25:14 +0000
@@ -950,7 +950,7 @@
 		return FALSE;
 
 	/* Must be whitespace after */
-	if (! strchr (NIH_CONFIG_WS, file[p + 3]))
+	if (file[p + 3] && ! strchr (NIH_CONFIG_WS, file[p + 3]))
 		return FALSE;
 
 	/* Find the second word */