Commit62a6f22

authored and

Felipe Zimmerle

committed

Fixes for Parfait errors - mostly unhandled NULL pointer dereference and data type mismatch

1 parent5f996d4 commit62a6f22Copy full SHA for 62a6f22

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1038,7 +1038,7 @@ static void hook_error_log(const char *file, int line, int level, apr_status_t s`
`1038`	`1038`	`#else`
`1039`	`1039`	`msr=create_tx_context((request_rec*)r);`
`1040`	`1040`	`#endif`
`1041`		`-if (msr->txcfg->debuglog_level >=9) {`
	`1041`	`+if (msr!=NULL&&msr->txcfg->debuglog_level >=9) {`
`1042`	`1042`	`if (msr==NULL) {`
`1043`	`1043`	`msr_log(msr,9,"Failed to create context after request failure.");`
`1044`	`1044`	`}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1340,6 +1340,10 @@ msre_actionset msre_actionset_create_default(msre_engine engine) {`
`1340`	`1340`	`* Sets the default values for the hard-coded actionset configuration.`
`1341`	`1341`	`*/`
`1342`	`1342`	`voidmsre_actionset_set_defaults(msre_actionset*actionset) {`
	`1343`	`+`
	`1344`	`+if (actionset==NULL) {`
	`1345`	`+return;`
	`1346`	`+ }`
`1343`	`1347`	`/* Metadata */`
`1344`	`1348`	`if (actionset->id==NOT_SET_P)actionset->id=NULL;`
`1345`	`1349`	`if (actionset->rev==NOT_SET_P)actionset->rev=NULL;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1470,7 +1470,7 @@ static apr_status_t msre_action_setenv_execute(modsec_rec msr, apr_pool_t mptm`
`1470`	`1470`	`env_name=log_escape_nq_ex(msr->mp,env->value,env->value_len);`
`1471`	`1471`
`1472`	`1472`	`/* Execute the requested action. */`
`1473`		`-if (env_name[0]=='!') {`
	`1473`	`+if (env_name!=NULL&&env_name[0]=='!') {`
`1474`	`1474`	`/* Delete */`
`1475`	`1475`	`apr_table_unset(msr->r->subprocess_env,env_name+1);`
`1476`	`1476`
`@@ -1532,7 +1532,7 @@ apr_status_t msre_action_setvar_execute(modsec_rec msr, apr_pool_t mptmp,`
`1532`	`1532`	`var_name=log_escape_nq_ex(msr->mp,var->value,var->value_len);`
`1533`	`1533`
`1534`	`1534`	`/* Handle the exclamation mark. */`
`1535`		`-if (var_name[0]=='!') {`
	`1535`	`+if (var_name!=NULL&&var_name[0]=='!') {`
`1536`	`1536`	`var_name=var_name+1;`
`1537`	`1537`	`is_negated=1;`
`1538`	`1538`	`}`

Comments

(0)