picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

alloc-util: return NULL if 0-sized allocation is requested 

That would almost certainly be an error (e.g., an overflow in computing
_need_), so it's better to fail.
This commit is contained in:
David Tardon 2018-10-09 16:53:43 +02:00
parent 8192548ef7
commit c05107767b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/basic/alloc-util.h
View File

@ -52,8 +52,11 @@ static inline void freep(void *p) {
#define _cleanup_free_ _cleanup_(freep)
/* Checks the size arguments of allocation functions for overflow in multiplication. In addition, checks if either of
* them is 0; that is almost certainly an error (e.g., an overflow in computing _need_), so it's better to fail (and
* we cannot leave this check to malloc, because the behavior of malloc(0) is impl. specific). */
static inline bool size_multiply_overflow(size_t size, size_t need) {
return _unlikely_(need != 0 && size > (SIZE_MAX / need));
return _unlikely_(need == 0 || size == 0 || size > (SIZE_MAX / need));
}
_malloc_ _alloc_(1, 2) static inline void *malloc_multiply(size_t size, size_t need) {