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

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

This reverts commit c05107767b.
This commit is contained in:
Yu Watanabe 2018-10-13 17:45:14 +09:00 committed by Lennart Poettering
parent d5bf4f9b8f
commit fd8879498d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,11 +52,8 @@ 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 == 0 || size > (SIZE_MAX / need));
return _unlikely_(need != 0 && size > (SIZE_MAX / need));
}
_malloc_ _alloc_(1, 2) static inline void *malloc_multiply(size_t size, size_t need) {