Module: kamailio Branch: master Commit: 1151e7da7d60a515d9f0d4746c39d8b7d4cc5b34 URL: https://github.com/kamailio/kamailio/commit/1151e7da7d60a515d9f0d4746c39d8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-01T09:11:12+02:00 app_sqlang: safety check for kemi func params used in log message - incresed size for local buffers --- Modified: src/modules/app_sqlang/app_sqlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1151e7da7d60a515d9f0d4746c39d8b… Patch: https://github.com/kamailio/kamailio/commit/1151e7da7d60a515d9f0d4746c39d8b… --- diff --git a/src/modules/app_sqlang/app_sqlang_mod.c b/src/modules/app_sqlang/app_sqlang_mod.c index 7d0240fb50..9f85b012ba 100644 --- a/src/modules/app_sqlang/app_sqlang_mod.c +++ b/src/modules/app_sqlang/app_sqlang_mod.c @@ -193,15 +193,16 @@ int sr_kemi_config_engine_sqlang(sip_msg_t *msg, int rtype, str *rname, return 1; } -static char _sqlang_buf_stack[4][512]; +#define SQLANG_BUF_STACK_SIZE 1024 +static char _sqlang_buf_stack[4][SQLANG_BUF_STACK_SIZE]; /** * */ static int ki_app_sqlang_dostring(sip_msg_t *msg, str *script) { - if(script==NULL || script->s==NULL || script->len>=511) { - LM_ERR("script too short or too long %d\n", script->len); + if(script==NULL || script->s==NULL || script->len>=SQLANG_BUF_STACK_SIZE-1) { + LM_ERR("script too short or too long %d\n", (script)?script->len:0); return -1; } if(!sqlang_sr_initialized()) @@ -233,8 +234,8 @@ static int w_app_sqlang_dostring(struct sip_msg *msg, char *script, char *extra) */ static int ki_app_sqlang_dofile(sip_msg_t *msg, str *script) { - if(script==NULL || script->s==NULL || script->len>=511) { - LM_ERR("script too short or too long %d\n", script->len); + if(script==NULL || script->s==NULL || script->len>=SQLANG_BUF_STACK_SIZE-1) { + LM_ERR("script too short or too long %d\n", (script)?script->len:0); return -1; } if(!sqlang_sr_initialized()) @@ -266,8 +267,8 @@ static int w_app_sqlang_dofile(struct sip_msg *msg, char *script, char *extra) */ static int ki_app_sqlang_runstring(sip_msg_t *msg, str *script) { - if(script==NULL || script->s==NULL || script->len>=511) { - LM_ERR("script too short or too long %d\n", script->len); + if(script==NULL || script->s==NULL || script->len>=SQLANG_BUF_STACK_SIZE-1) { + LM_ERR("script too short or too long %d\n", (script)?script->len:0); return -1; } if(!sqlang_sr_initialized()) @@ -311,7 +312,7 @@ static int w_app_sqlang_run(struct sip_msg *msg, char *func, char *p1, char *p2, LM_ERR("cannot get the function\n"); return -1; } - if(s.len>=511) + if(s.len>=SQLANG_BUF_STACK_SIZE-1) { LM_ERR("function too long %d\n", s.len); return -1; @@ -326,7 +327,7 @@ static int w_app_sqlang_run(struct sip_msg *msg, char *func, char *p1, char *p2, LM_ERR("cannot get p1\n"); return -1; } - if(s.len>=511) + if(s.len>=SQLANG_BUF_STACK_SIZE-1) { LM_ERR("p1 too long %d\n", s.len); return -1; @@ -341,7 +342,7 @@ static int w_app_sqlang_run(struct sip_msg *msg, char *func, char *p1, char *p2, LM_ERR("cannot get p2\n"); return -1; } - if(s.len>=511) + if(s.len>=SQLANG_BUF_STACK_SIZE-1) { LM_ERR("p2 too long %d\n", s.len); return -1; @@ -356,7 +357,7 @@ static int w_app_sqlang_run(struct sip_msg *msg, char *func, char *p1, char *p2, LM_ERR("cannot get p3\n"); return -1; } - if(s.len>=511) + if(s.len>=SQLANG_BUF_STACK_SIZE-1) { LM_ERR("p3 too long %d\n", s.len); return -1;