From 52f88e8b25cddb441f12858e628ab46568af6a29 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 26 Mar 2023 17:25:46 -0700 Subject: [PATCH] security.c: avoid NULL + 0 UBSAN error UBSAN complains about adding 0 to NULL. Avoid this. --- src/security.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/security.c b/src/security.c index 714e1034..f674fa9a 100644 --- a/src/security.c +++ b/src/security.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2012, 2013, 2014 Eric Biggers + * Copyright 2012-2023 Eric Biggers * * This file is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free @@ -242,10 +242,10 @@ void rollback_new_security_descriptors(struct wim_sd_set *sd_set) { struct wim_security_data *sd = sd_set->sd; - u8 **descriptors = sd->descriptors + sd_set->orig_num_entries; - u32 num_entries = sd->num_entries - sd_set->orig_num_entries; - while (num_entries--) - FREE(*descriptors++); + u32 i; + + for (i = sd_set->orig_num_entries; i < sd->num_entries; i++) + FREE(sd->descriptors[i]); sd->num_entries = sd_set->orig_num_entries; } -- 2.43.0