mod_http: Use hostname from the correct context (thanks gryffus)

[prosody.git] / util-src / encodings.c

diff --git a/util-src/encodings.c b/util-src/encodings.c
index e00f00916b27de765bddaea0263539a5e62368a2..b9b6160a03809c2eb7b1c04a2622f0a90814592b 100644 (file)
--- a/util-src/encodings.c
+++ b/util-src/encodings.c
@@ -145,13 +145,17 @@ static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile)
                return 1;
        }
        u_strFromUTF8(unprepped, 1024, &unprepped_len, input, input_len, &err);
+       if (U_FAILURE(err)) {
+               lua_pushnil(L);
+               return 1;
+       }
        prepped_len = usprep_prepare(profile, unprepped, unprepped_len, prepped, 1024, 0, NULL, &err);
        if (U_FAILURE(err)) {
                lua_pushnil(L);
                return 1;
        } else {
                u_strToUTF8(output, 1024, &output_len, prepped, prepped_len, &err);
-               if(output_len < 1024)
+               if (U_SUCCESS(err) && output_len < 1024)
                        lua_pushlstring(L, output, output_len);
                else
                        lua_pushnil(L);
@@ -258,13 +262,18 @@ static int Lidna_to_ascii(lua_State *L)           /** idna.to_ascii(s) */
        char output[1024];
 
        u_strFromUTF8(ustr, 1024, &ulen, s, len, &err);
+       if (U_FAILURE(err)) {
+               lua_pushnil(L);
+               return 1;
+       }
+
        dest_len = uidna_IDNToASCII(ustr, ulen, dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err);
        if (U_FAILURE(err)) {
                lua_pushnil(L);
                return 1;
        } else {
                u_strToUTF8(output, 1024, &output_len, dest, dest_len, &err);
-               if(output_len < 1024)
+               if (U_SUCCESS(err) && output_len < 1024)
                        lua_pushlstring(L, output, output_len);
                else
                        lua_pushnil(L);
@@ -283,13 +292,18 @@ static int Lidna_to_unicode(lua_State *L)         /** idna.to_unicode(s) */
        char output[1024];
 
        u_strFromUTF8(ustr, 1024, &ulen, s, len, &err);
+       if (U_FAILURE(err)) {
+               lua_pushnil(L);
+               return 1;
+       }
+
        dest_len = uidna_IDNToUnicode(ustr, ulen, dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err);
        if (U_FAILURE(err)) {
                lua_pushnil(L);
                return 1;
        } else {
                u_strToUTF8(output, 1024, &output_len, dest, dest_len, &err);
-               if(output_len < 1024)
+               if (U_SUCCESS(err) && output_len < 1024)
                        lua_pushlstring(L, output, output_len);
                else
                        lua_pushnil(L);