Skip to content

Commit 152705b

Browse files
gitsterdscho
authored andcommitted
hashmap_for_each_entry(): workaround MSVC's runtime check failure #3
The OFFSETOF_VAR(var, member) macro is implemented in terms of offsetof(typeof(*var), member) with compilers that know typeof(), but its fallback implemenation compares &(var->member) and (var) and count the distance in bytes, i.e. ((uintptr_t)&(var)->member - (uintptr_t)(var)) MSVC's runtime check, when fed an uninitialized 'var', flags this as a use of an uninitialized variable (and that is legit---uninitialized contents of 'var' is subtracted) in a debug build. After auditing all 6 uses of OFFSETOF_VAR(), 1 of them does feed a potentially uninitialized 'var' to the macro in the beginning of the for() loop: #define hashmap_for_each_entry(map, iter, var, member) \ for (var = hashmap_iter_first_entry_offset(map, iter, \ OFFSETOF_VAR(var, member)); \ var; \ var = hashmap_iter_next_entry_offset(iter, \ OFFSETOF_VAR(var, member))) We can work around this by making sure that var has _some_ value when OFFSETOF_VAR() is called. Strictly speaking, it invites undefined behaviour to use NULL here if we end up with pointer comparison, but MSVC runtime seems to be happy with it, and most other systems have typeof() and don't even need pointer comparison fallback code. Signed-off-by: Junio C Hamano <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 68a7d98 commit 152705b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

hashmap.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,8 @@ static inline struct hashmap_entry *hashmap_iter_first(struct hashmap *map,
449449
* containing a @member which is a "struct hashmap_entry"
450450
*/
451451
#define hashmap_for_each_entry(map, iter, var, member) \
452-
for (var = hashmap_iter_first_entry_offset(map, iter, \
452+
for (var = NULL, /* for systems without typeof */ \
453+
var = hashmap_iter_first_entry_offset(map, iter, \
453454
OFFSETOF_VAR(var, member)); \
454455
var; \
455456
var = hashmap_iter_next_entry_offset(iter, \

0 commit comments

Comments
 (0)