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

util.crand: Let Lua handle allocation, freeing and error handling for buffer

Browse source
This commit is contained in:
Kim Alvefur 2017-01-20 11:52:46 +01:00
parent 41485b40ab
commit a59ab44459
1 changed files with 3 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

43
util-src/crand.c
View file

@ -19,15 +19,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
/*
* TODO: Decide on fixed size or dynamically allocated buffer
*/
#if 1
#include <stdlib.h>
#else
#define BUFLEN 256
#endif
#if defined(WITH_GETRANDOM) #if defined(WITH_GETRANDOM)
#include <unistd.h> #include <unistd.h>
#include <sys/syscall.h> #include <sys/syscall.h>
@ -38,7 +29,7 @@
#endif #endif
/* Was this not supposed to be a function? */ /* Was this not supposed to be a function? */
int getrandom(char *buf, size_t len, int flags) { int getrandom(void *buf, size_t len, int flags) {
return syscall(SYS_getrandom, buf, len, flags); return syscall(SYS_getrandom, buf, len, flags);
} }
@ -51,36 +42,14 @@ int getrandom(char *buf, size_t len, int flags) {
#endif #endif
int Lrandom(lua_State *L) { int Lrandom(lua_State *L) {
#ifdef BUFLEN
unsigned char buf[BUFLEN];
#else
unsigned char *buf;
#endif
int ret = 0; int ret = 0;
size_t len = (size_t)luaL_checkinteger(L, 1); size_t len = (size_t)luaL_checkinteger(L, 1);
#ifdef BUFLEN void *buf = lua_newuserdata(L, len);
len = len > BUFLEN ? BUFLEN : len;
#else
buf = malloc(len);
if(buf == NULL) {
lua_pushnil(L);
lua_pushstring(L, "out of memory");
/* or it migth be better to
* return lua_error(L);
*/
return 2;
}
#endif
#if defined(WITH_GETRANDOM) #if defined(WITH_GETRANDOM)
ret = getrandom(buf, len, 0); ret = getrandom(buf, len, 0);
if(ret < 0) { if(ret < 0) {
#ifndef BUFLEN
free(buf);
#endif
lua_pushnil(L); lua_pushnil(L);
lua_pushstring(L, strerror(errno)); lua_pushstring(L, strerror(errno));
lua_pushinteger(L, errno); lua_pushinteger(L, errno);
@ -96,9 +65,6 @@ int Lrandom(lua_State *L) {
if(ret == 1) { if(ret == 1) {
ret = len; ret = len;
} else { } else {
#ifndef BUFLEN
free(buf);
#endif
lua_pushnil(L); lua_pushnil(L);
lua_pushstring(L, "failed"); lua_pushstring(L, "failed");
/* lua_pushinteger(L, ERR_get_error()); */ /* lua_pushinteger(L, ERR_get_error()); */
@ -107,10 +73,7 @@ int Lrandom(lua_State *L) {
#endif #endif
lua_pushlstring(L, (const char *)buf, ret); lua_pushlstring(L, buf, ret);
#ifndef BUFLEN
free(buf);
#endif
return 1; return 1;
} }