mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.encodings: Check return values before proceeding

Browse source
This commit is contained in:
Paul Aurich 2011-05-22 16:14:10 -07:00
parent 6499dc4b3b
commit 544b19989d
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
util-src/encodings.c
View file

@ -145,13 +145,17 @@ static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile)
return 1; return 1;
} }
u_strFromUTF8(unprepped, 1024, &unprepped_len, input, input_len, &err); u_strFromUTF8(unprepped, 1024, &unprepped_len, input, input_len, &err);
if (U_FAILURE(err)) {
luah_pushnil(L);
return 1;
}
prepped_len = usprep_prepare(profile, unprepped, unprepped_len, prepped, 1024, 0, NULL, &err); prepped_len = usprep_prepare(profile, unprepped, unprepped_len, prepped, 1024, 0, NULL, &err);
if (U_FAILURE(err)) { if (U_FAILURE(err)) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} else { } else {
u_strToUTF8(output, 1024, &output_len, prepped, prepped_len, &err); 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); lua_pushlstring(L, output, output_len);
else else
lua_pushnil(L); lua_pushnil(L);
@ -258,13 +262,18 @@ static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */
char output[1024]; char output[1024];
u_strFromUTF8(ustr, 1024, &ulen, s, len, &err); 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); dest_len = uidna_IDNToASCII(ustr, ulen, dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err);
if (U_FAILURE(err)) { if (U_FAILURE(err)) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} else { } else {
u_strToUTF8(output, 1024, &output_len, dest, dest_len, &err); 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); lua_pushlstring(L, output, output_len);
else else
lua_pushnil(L); lua_pushnil(L);
@ -283,13 +292,18 @@ static int Lidna_to_unicode(lua_State *L) /** idna.to_unicode(s) */
char output[1024]; char output[1024];
u_strFromUTF8(ustr, 1024, &ulen, s, len, &err); 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); dest_len = uidna_IDNToUnicode(ustr, ulen, dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err);
if (U_FAILURE(err)) { if (U_FAILURE(err)) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} else { } else {
u_strToUTF8(output, 1024, &output_len, dest, dest_len, &err); 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); lua_pushlstring(L, output, output_len);
else else
lua_pushnil(L); lua_pushnil(L);