diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:21:29 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:21:29 +0100 |
| commit | ec83b2aa91ab9142ad6e7f4d26b0f6d20853e747 (patch) | |
| tree | ac1899833b30b87ea97439f061e9b892bd188367 /util-src | |
| parent | 150799952b2bb969b2cea28c48f52b9ccad13b2b (diff) | |
| parent | d67ec1537ba3d0e41615f43c0afe13828ecc002e (diff) | |
| download | prosody-ec83b2aa91ab9142ad6e7f4d26b0f6d20853e747.tar.gz prosody-ec83b2aa91ab9142ad6e7f4d26b0f6d20853e747.zip | |
Merge
Diffstat (limited to 'util-src')
| -rw-r--r-- | util-src/encodings.c | 5 | ||||
| -rw-r--r-- | util-src/pposix.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/util-src/encodings.c b/util-src/encodings.c index 2eaad2c8..c00b2267 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -476,14 +476,15 @@ static int Lidna_to_unicode(lua_State* L) { /** idna.to_unicode(s) */ static int Lidna_to_ascii(lua_State* L) { /** idna.to_ascii(s) */ size_t len; const char* s = check_utf8(L, 1, &len); + char* output = NULL; + int ret; if(s == NULL || len != strlen(s)) { lua_pushnil(L); return 1; /* TODO return error message */ } - char* output = NULL; - int ret = idna_to_ascii_8z(s, &output, IDNA_USE_STD3_ASCII_RULES); + ret = idna_to_ascii_8z(s, &output, IDNA_USE_STD3_ASCII_RULES); if(ret == IDNA_SUCCESS) { lua_pushstring(L, output); diff --git a/util-src/pposix.c b/util-src/pposix.c index d797f032..5288b08c 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -750,7 +750,10 @@ int lc_fallocate(lua_State* L) { lua_pushstring(L, strerror(ret)); /* posix_fallocate() can leave a bunch of NULs at the end, so we cut that * this assumes that offset == length of the file */ - ftruncate(fileno(f), offset); + if(ftruncate(fileno(f), offset) != 0) { + lua_pushstring(L, strerror(errno)); + return 3; + } return 2; } } |