projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modulemanager: Removed another legacy events API (add_event_hook), and related code.
[prosody.git]
/
util-src
/
encodings.c
diff --git
a/util-src/encodings.c
b/util-src/encodings.c
index d7aabc143a44ccbdfef2aff9ed21054215525aeb..f2109d0c1a2433e2b0f88afd5b9e5f5a00046576 100644
(file)
--- a/
util-src/encodings.c
+++ b/
util-src/encodings.c
@@
-1,6
+1,6
@@
-/* Prosody IM
v0.4
--- Copyright (C) 2008-20
09
Matthew Wild
--- Copyright (C) 2008-20
09
Waqas Hussain
+/* Prosody IM
+-- Copyright (C) 2008-20
10
Matthew Wild
+-- Copyright (C) 2008-20
10
Waqas Hussain
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
@@
-108,7
+108,6
@@
static int Lbase64_decode(lua_State *L) /** decode(s) */
break;
}
}
break;
}
}
- return 0;
}
static const luaL_Reg Reg_base64[] =
}
static const luaL_Reg Reg_base64[] =
@@
-125,9
+124,14
@@
static const luaL_Reg Reg_base64[] =
static int stringprep_prep(lua_State *L, const Stringprep_profile *profile)
{
size_t len;
static int stringprep_prep(lua_State *L, const Stringprep_profile *profile)
{
size_t len;
- const char *s
= luaL_checklstring(L, 1, &len)
;
+ const char *s;
char string[1024];
int ret;
char string[1024];
int ret;
+ if(!lua_isstring(L, 1)) {
+ lua_pushnil(L);
+ return 1;
+ }
+ s = lua_tolstring(L, 1, &len);
if (len >= 1024) {
lua_pushnil(L);
return 1; // TODO return error message
if (len >= 1024) {
lua_pushnil(L);
return 1; // TODO return error message
@@
-163,20
+167,21
@@
static const luaL_Reg Reg_stringprep[] =
/***************** IDNA *****************/
#include <idna.h>
/***************** IDNA *****************/
#include <idna.h>
+#include <idn-free.h>
static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */
{
size_t len;
const char *s = luaL_checklstring(L, 1, &len);
char* output = NULL;
static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */
{
size_t len;
const char *s = luaL_checklstring(L, 1, &len);
char* output = NULL;
- int ret = idna_to_ascii_8z(s, &output,
0
);
+ int ret = idna_to_ascii_8z(s, &output,
IDNA_USE_STD3_ASCII_RULES
);
if (ret == IDNA_SUCCESS) {
lua_pushstring(L, output);
if (ret == IDNA_SUCCESS) {
lua_pushstring(L, output);
- i
f (output)
free(output);
+ i
dn_
free(output);
return 1;
} else {
lua_pushnil(L);
return 1;
} else {
lua_pushnil(L);
- i
f (output)
free(output);
+ i
dn_
free(output);
return 1; // TODO return error message
}
}
return 1; // TODO return error message
}
}
@@
-189,11
+194,11
@@
static int Lidna_to_unicode(lua_State *L) /** idna.to_unicode(s) */
int ret = idna_to_unicode_8z8z(s, &output, 0);
if (ret == IDNA_SUCCESS) {
lua_pushstring(L, output);
int ret = idna_to_unicode_8z8z(s, &output, 0);
if (ret == IDNA_SUCCESS) {
lua_pushstring(L, output);
- i
f (output)
free(output);
+ i
dn_
free(output);
return 1;
} else {
lua_pushnil(L);
return 1;
} else {
lua_pushnil(L);
- i
f (output)
free(output);
+ i
dn_
free(output);
return 1; // TODO return error message
}
}
return 1; // TODO return error message
}
}