aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-09-29 19:05:32 +0100
committerMatthew Wild <mwild1@gmail.com>2009-09-29 19:05:32 +0100
commite094c8b08b002896c440c3b55785bcf119007c91 (patch)
tree32de464dfa60c0bb2e13a348751d067e273294bb
parentd059f42d87dec4b77e0aad6fb1383bc95399d8c1 (diff)
downloadprosody-e094c8b08b002896c440c3b55785bcf119007c91.tar.gz
prosody-e094c8b08b002896c440c3b55785bcf119007c91.zip
util.encodings: Don't throw an error but return nil when passed nil or a non-string value
-rw-r--r--util-src/encodings.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/util-src/encodings.c b/util-src/encodings.c
index 65d7d501..bee4365c 100644
--- a/util-src/encodings.c
+++ b/util-src/encodings.c
@@ -124,8 +124,12 @@ static const luaL_Reg Reg_base64[] =
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) {