Enforce abort_conf:true when malloc_conf is not fully recognized.
Ensures the malloc_conf "ends with key", "ends with comma" and "malform conf string" cases abort under abort_conf:true.
This commit is contained in:
parent
113e8e68e1
commit
af6ee27c0d
@ -845,10 +845,12 @@ malloc_conf_next(char const **opts_p, char const **k_p, size_t *klen_p,
|
|||||||
if (opts != *opts_p) {
|
if (opts != *opts_p) {
|
||||||
malloc_write("<jemalloc>: Conf string ends "
|
malloc_write("<jemalloc>: Conf string ends "
|
||||||
"with key\n");
|
"with key\n");
|
||||||
|
had_conf_error = true;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
malloc_write("<jemalloc>: Malformed conf string\n");
|
malloc_write("<jemalloc>: Malformed conf string\n");
|
||||||
|
had_conf_error = true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -867,6 +869,7 @@ malloc_conf_next(char const **opts_p, char const **k_p, size_t *klen_p,
|
|||||||
if (*opts == '\0') {
|
if (*opts == '\0') {
|
||||||
malloc_write("<jemalloc>: Conf string ends "
|
malloc_write("<jemalloc>: Conf string ends "
|
||||||
"with comma\n");
|
"with comma\n");
|
||||||
|
had_conf_error = true;
|
||||||
}
|
}
|
||||||
*vlen_p = (uintptr_t)opts - 1 - (uintptr_t)*v_p;
|
*vlen_p = (uintptr_t)opts - 1 - (uintptr_t)*v_p;
|
||||||
accept = true;
|
accept = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user