Merge with 0.5

Tue, 29 Sep 2009 19:07:17 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Tue, 29 Sep 2009 19:07:17 +0100
changeset 1845
e52dbae3c05d
parent 1843
07d8c9184a5f (current diff)
parent 1844
a4a8fe2a560c (diff)
child 1847
1842da566c7d

Merge with 0.5

--- a/util-src/encodings.c	Tue Sep 29 14:22:43 2009 +0100
+++ b/util-src/encodings.c	Tue Sep 29 19:07:17 2009 +0100
@@ -124,8 +124,12 @@
 
 static int stringprep_prep(lua_State *L, const Stringprep_profile *profile)
 {
+	if(!lua_isstring(L, 1)) {
+		lua_pushnil(L);
+		return 1;
+	}
 	size_t len;
-	const char *s = luaL_checklstring(L, 1, &len);
+	const char *s = lua_tolstring(L, 1, &len);
 	char string[1024];
 	int ret;
 	if (len >= 1024) {

mercurial