Browse Source

posix: env: use sizeof void ptr instead of char ptr ptr

Coverity regularly raised a CID with every release that it found
`sizeof(char **)` confusing and somehow nonportable.

With every release, it needed to be marked as a false positive.

Change `sizeof(char **)` to `sizeof(void *)` to silence the
CID warnings.

Signed-off-by: Chris Friedt <cfriedt@tenstorrent.com>
pull/92271/head
Chris Friedt 2 weeks ago committed by Dan Kalowsky
parent
commit
c3368f6491
  1. 12
      lib/posix/options/env_common.c

12
lib/posix/options/env_common.c

@ -151,17 +151,17 @@ int z_setenv(const char *name, const char *val, int overwrite)
} else { } else {
/* name was not found in environ -> add new entry */ /* name was not found in environ -> add new entry */
esize = environ_size(); esize = environ_size();
envp = realloc(environ, sizeof(char **) * envp = realloc(environ,
(esize + 1 /* new entry */ + 1 /* NULL */)); sizeof(void *) * (esize + 1 /* new entry */ + 1 /* NULL */));
if (envp == NULL) { if (envp == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
SYS_SEM_LOCK_BREAK; SYS_SEM_LOCK_BREAK;
} }
if (TRACK_ALLOC) { if (TRACK_ALLOC) {
allocated += sizeof(char **) * (esize + 2); allocated += sizeof(void *) * (esize + 2);
LOG_DBG("realloc %zu bytes (allocated: %zu)", LOG_DBG("realloc %zu bytes (allocated: %zu)",
sizeof(char **) * (esize + 2), allocated); sizeof(void *) * (esize + 2), allocated);
} }
environ = envp; environ = envp;
@ -238,7 +238,7 @@ int z_unsetenv(const char *name)
free(environ); free(environ);
environ = NULL; environ = NULL;
} else { } else {
envp = realloc(environ, (esize + 1 /* NULL */) * sizeof(char **)); envp = realloc(environ, (esize + 1 /* NULL */) * sizeof(void *));
if (envp != NULL) { if (envp != NULL) {
environ = envp; environ = envp;
} }
@ -247,7 +247,7 @@ int z_unsetenv(const char *name)
if (TRACK_ALLOC) { if (TRACK_ALLOC) {
/* recycle nsize here */ /* recycle nsize here */
nsize = ((esize == 0) ? 2 : 1) * sizeof(char **); nsize = ((esize == 0) ? 2 : 1) * sizeof(void *);
allocated -= nsize; allocated -= nsize;
LOG_DBG("free %zu bytes (allocated: %zu)", nsize, allocated); LOG_DBG("free %zu bytes (allocated: %zu)", nsize, allocated);
} }

Loading…
Cancel
Save