# 
# 
# patch "ChangeLog"
#  from [b3f45e326894ef89cbbd6522453ab23954db2f98]
#    to [28878d03b8079b7ce44bbc248f122c79a699ecc5]
# 
# patch "lua/lstrlib.cc"
#  from [e6d795ebe24ed6f0784a33ca635454f90cb23ebb]
#    to [c6616bf2d86fa5d574aa45af23b4b8d3c066023f]
# 
============================================================
--- ChangeLog	b3f45e326894ef89cbbd6522453ab23954db2f98
+++ ChangeLog	28878d03b8079b7ce44bbc248f122c79a699ecc5
@@ -1,3 +1,8 @@
+2006-10-24  Matthew Gregan  <address@hidden>
+
+	* lua/lstrlib.cc: Patch for Lua 5.1.1 bug #3, from
+	lua.org/bugs.html.
+
 2006-10-22  Matthew Nicholson  <address@hidden>
 
 	* debian/monotone-server.postinst: Swap execution of 'set +e' and 'set
============================================================
--- lua/lstrlib.cc	e6d795ebe24ed6f0784a33ca635454f90cb23ebb
+++ lua/lstrlib.cc	c6616bf2d86fa5d574aa45af23b4b8d3c066023f
@@ -723,7 +723,7 @@ static const char *scanformat (lua_State
 
 static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
   const char *p = strfrmt;
-  while (strchr(FLAGS, *p)) p++;  /* skip flags */
+  while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++;  /* skip flags */
   if ((size_t)(p - strfrmt) >= sizeof(FLAGS))
     luaL_error(L, "invalid format (repeated flags)");
   if (isdigit(uchar(*p))) p++;  /* skip width */