Lua-cURL/Lua-cURLv3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix. Validate allocated memory buffer.

Browse Source
This commit is contained in:
Alexey Melnichuk 2018-05-02 00:22:29 +03:00
parent 11d44d6bbe
commit e5f68e09cb
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lcmulti.c
View File

@ -24,7 +24,6 @@
#include "lcerror.h" #include "lcerror.h"
#include "lcutils.h" #include "lcutils.h"
#include "lchttppost.h" #include "lchttppost.h"
#include <stdio.h>
#define LCURL_MULTI_NAME LCURL_PREFIX" Multi" #define LCURL_MULTI_NAME LCURL_PREFIX" Multi"
static const char *LCURL_MULTI = LCURL_MULTI_NAME; static const char *LCURL_MULTI = LCURL_MULTI_NAME;
@ -434,21 +433,17 @@ static int lcurl_opt_set_string_array_(lua_State *L, int opt){
n = lua_rawlen(L, 2); n = lua_rawlen(L, 2);
} }
fprintf(stderr, "\n>>> array size %d\n", n);
if(n == 0){ if(n == 0){
code = curl_multi_setopt(p->curl, opt, 0); code = curl_multi_setopt(p->curl, opt, 0);
} }
else{ else{
int i; int i;
char const* *val = malloc(sizeof(char*) * (n + 1)); char const**val = malloc(sizeof(char*) * (n + 1));
fprintf(stderr, ">>> allocate size %d: %p\n", sizeof(char*) * (n + 1), val); if(!val){
if(!*val){
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, CURLM_OUT_OF_MEMORY); return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, CURLM_OUT_OF_MEMORY);
} }
for(i = 1; i <= n; ++i){ for(i = 1; i <= n; ++i){
lua_rawgeti(L, 2, i); lua_rawgeti(L, 2, i);
fprintf(stderr, ">>> add string %s\n", lua_tostring(L, -1));
val[i-1] = lua_tostring(L, -1); val[i-1] = lua_tostring(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
} }
@ -456,7 +451,6 @@ static int lcurl_opt_set_string_array_(lua_State *L, int opt){
code = curl_multi_setopt(p->curl, opt, val); code = curl_multi_setopt(p->curl, opt, val);
free((void*)val); free((void*)val);
} }
fprintf(stderr, ">>> setopt result %d\n", code);
if(code != CURLM_OK){ if(code != CURLM_OK){
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code); return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);