# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1171215682 0
# Node ID 2b400e438e999b93a0164ef3986eaf16fb6c5fed
# Parent  a6a0a5670762df34aaf38469ac492b8ecdb1da5f
Fix bug.
New tests.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-11  Bruno Haible  <bruno@clisp.org>
+
+	* lib/mbschr.c (mbschr): Fix bug.
+
+	* modules/mbschr-tests: New file.
+	* tests/test-mbschr.sh: New file.
+	* tests/test-mbschr.c: New file.
+	* m4/locale-zh.m4: New file.
+
 2007-02-11  Bruno Haible  <bruno@clisp.org>
 
 	Support for copying multibyte string iterators.
diff --git a/lib/mbschr.c b/lib/mbschr.c
--- a/lib/mbschr.c
+++ b/lib/mbschr.c
@@ -41,11 +41,11 @@
 
       for (mbui_init (iter, string);; mbui_advance (iter))
 	{
+	  if (!mbui_avail (iter))
+	    goto notfound;
 	  if (mb_len (mbui_cur (iter)) == 1
 	      && (unsigned char) * mbui_cur_ptr (iter) == (unsigned char) c)
 	    break;
-	  if (!mbui_avail (iter))
-	    goto notfound;
 	}
       return (char *) mbui_cur_ptr (iter);
      notfound: