From nobody Sat May 4 02:32:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490031232179546.173182084423; Mon, 20 Mar 2017 10:33:52 -0700 (PDT) Received: from localhost ([::1]:34156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cq1Bl-0001Em-DA for importer@patchew.org; Mon, 20 Mar 2017 13:33:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cq1BF-0001EP-OC for qemu-devel@nongnu.org; Mon, 20 Mar 2017 13:33:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cq1BC-0007pS-KM for qemu-devel@nongnu.org; Mon, 20 Mar 2017 13:33:17 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:34820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cq1BC-0007pJ-CO; Mon, 20 Mar 2017 13:33:14 -0400 Received: by mail-pf0-x242.google.com with SMTP id n11so6956571pfg.2; Mon, 20 Mar 2017 10:33:14 -0700 (PDT) Received: from localhost.localdomain ([49.207.48.255]) by smtp.gmail.com with ESMTPSA id o17sm34460852pfa.98.2017.03.20.10.33.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 10:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=JaSesk7TdWA0co9k9fgTE3KGdysdq8vB9Wj3DB4aIgE=; b=YyBGFT7Hs12HvlCYLLMxS/9acWzjBgremQeA51rMfYU6ilvMhvA3Rem5rBtuG96WCW zuoork+y/2J1+uGMf3giGL6Lzcj09VCzsOoGGKm6YcnlqrgGaeDzm7fCjl78lSZTl/93 nGFoCywX7yeHz+cZgXCTSXQO+nKToseuSCz6hR+tiIRxeAIhU8AjxNlQReuejfrNZ/sP bxtwExDCwNObRG43Ni4IYP4impahy7Fp9WWNFuF7odlGi8Mg2A9T+L0MwEj92G/nZUsT s/U1qSIwH5HO694XZhTOEuUD/RWHlm0gZPBU7BKbJZAoN4ZDDUO5mkkbmc/8eQa0zOxs RyRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JaSesk7TdWA0co9k9fgTE3KGdysdq8vB9Wj3DB4aIgE=; b=MLry3eBwcWuHlZh+To+V0K86yWJcYuOfl6CA4Of8zLJFskuevbQ1doEzLFSqFTqdP7 Z+PkJ2FVBT45qqrocs/gMfCeV+6xT3AAwVMFpv3S87KuwoLw0H3BzIuEgoEOKnLEe3be m99h0WRSa1heBmjBKTera4FMHGziUsZr/oOe1e0FrnYdLmOonYiCjitKp7YzefXabO+U A32i/PXnpkRAUJ/XRgZX/9aszGUT+sIzvcSQ8hJvgPtZPAEM/RpAXFrANGhJqGeKoqkp slFvqI9CcQ6KANtDY1HrWXrKtievLGs22UO22Gf7gLGKTcUc7LULJBWF/ULdTrJeFl/Q Obfg== X-Gm-Message-State: AFeK/H1HEOPSHHshQ6eOwpvGn+5u1qoVsdHGMiMp09n8v2tk1SVlU2gTH6O75w6hIZqTfg== X-Received: by 10.84.129.3 with SMTP id 3mr42201136plb.150.1490031192765; Mon, 20 Mar 2017 10:33:12 -0700 (PDT) From: Saurav Sachidanand To: qemu-devel@nongnu.org Date: Mon, 20 Mar 2017 17:32:58 +0000 Message-Id: <20170320173258.3621-1-sauravsachidanand@gmail.com> X-Mailer: git-send-email 2.12.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [Qemu-trivial] [PATCH v4] util: Use g_malloc/g_free in envlist.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, stefanha@gmail.com, Saurav Sachidanand , laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Change malloc/strdup/free to g_malloc/g_strdup/g_free in util/envlist.c. Remove NULL checks for pointers returned from g_malloc and g_strdup as they exit in case of failure. Also, update calls to envlist_create to reflect this. Free array and array contents returned by envlist_to_environ using g_free in bsd-user/main.c and linux-user/main.c. Update comments to reflect change in semantics. --- bsd-user/main.c | 14 ++++---------- linux-user/main.c | 9 +++------ util/envlist.c | 47 +++++++++++++++++++---------------------------- 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 714a692e6f..04f95ddd54 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -744,10 +744,7 @@ int main(int argc, char **argv) qemu_init_cpu_list(); module_call_init(MODULE_INIT_QOM); =20 - if ((envlist =3D envlist_create()) =3D=3D NULL) { - (void) fprintf(stderr, "Unable to allocate envlist\n"); - exit(1); - } + envlist =3D envlist_create(); =20 /* add current environment into the list */ for (wrk =3D environ; *wrk !=3D NULL; wrk++) { @@ -785,10 +782,7 @@ int main(int argc, char **argv) usage(); } else if (!strcmp(r, "ignore-environment")) { envlist_free(envlist); - if ((envlist =3D envlist_create()) =3D=3D NULL) { - (void) fprintf(stderr, "Unable to allocate envlist\n"); - exit(1); - } + envlist =3D envlist_create(); } else if (!strcmp(r, "U")) { r =3D argv[optind++]; if (envlist_unsetenv(envlist, r) !=3D 0) @@ -956,10 +950,10 @@ int main(int argc, char **argv) } =20 for (wrk =3D target_environ; *wrk; wrk++) { - free(*wrk); + g_free(*wrk); } =20 - free(target_environ); + g_free(target_environ); =20 if (qemu_loglevel_mask(CPU_LOG_PAGE)) { qemu_log("guest_base 0x%lx\n", guest_base); diff --git a/linux-user/main.c b/linux-user/main.c index 10a3bb3a12..5f20769cb9 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4229,10 +4229,7 @@ int main(int argc, char **argv, char **envp) qemu_init_cpu_list(); module_call_init(MODULE_INIT_QOM); =20 - if ((envlist =3D envlist_create()) =3D=3D NULL) { - (void) fprintf(stderr, "Unable to allocate envlist\n"); - exit(EXIT_FAILURE); - } + envlist =3D envlist_create(); =20 /* add current environment into the list */ for (wrk =3D environ; *wrk !=3D NULL; wrk++) { @@ -4429,10 +4426,10 @@ int main(int argc, char **argv, char **envp) } =20 for (wrk =3D target_environ; *wrk; wrk++) { - free(*wrk); + g_free(*wrk); } =20 - free(target_environ); + g_free(target_environ); =20 if (qemu_loglevel_mask(CPU_LOG_PAGE)) { qemu_log("guest_base 0x%lx\n", guest_base); diff --git a/util/envlist.c b/util/envlist.c index e86857e70a..1eeb7fca87 100644 --- a/util/envlist.c +++ b/util/envlist.c @@ -17,16 +17,14 @@ static int envlist_parse(envlist_t *envlist, const char *env, int (*)(envlist_t *, const char *)); =20 /* - * Allocates new envlist and returns pointer to that or - * NULL in case of error. + * Allocates new envlist and returns pointer to it. */ envlist_t * envlist_create(void) { envlist_t *envlist; =20 - if ((envlist =3D malloc(sizeof (*envlist))) =3D=3D NULL) - return (NULL); + envlist =3D g_malloc(sizeof(*envlist)); =20 QLIST_INIT(&envlist->el_entries); envlist->el_count =3D 0; @@ -48,10 +46,10 @@ envlist_free(envlist_t *envlist) entry =3D envlist->el_entries.lh_first; QLIST_REMOVE(entry, ev_link); =20 - free((char *)entry->ev_var); - free(entry); + g_free((char *)entry->ev_var); + g_free(entry); } - free(envlist); + g_free(envlist); } =20 /* @@ -101,8 +99,7 @@ envlist_parse(envlist_t *envlist, const char *env, if ((envlist =3D=3D NULL) || (env =3D=3D NULL)) return (EINVAL); =20 - if ((tmpenv =3D strdup(env)) =3D=3D NULL) - return (errno); + tmpenv =3D g_strdup(env); envsave =3D tmpenv; =20 do { @@ -117,7 +114,7 @@ envlist_parse(envlist_t *envlist, const char *env, tmpenv =3D envvar + 1; } while (envvar !=3D NULL); =20 - free(envsave); + g_free(envsave); return ret; } =20 @@ -155,18 +152,14 @@ envlist_setenv(envlist_t *envlist, const char *env) =20 if (entry !=3D NULL) { QLIST_REMOVE(entry, ev_link); - free((char *)entry->ev_var); - free(entry); + g_free((char *)entry->ev_var); + g_free(entry); } else { envlist->el_count++; } =20 - if ((entry =3D malloc(sizeof (*entry))) =3D=3D NULL) - return (errno); - if ((entry->ev_var =3D strdup(env)) =3D=3D NULL) { - free(entry); - return (errno); - } + entry =3D g_malloc(sizeof(*entry)); + entry->ev_var =3D g_strdup(env); QLIST_INSERT_HEAD(&envlist->el_entries, entry, ev_link); =20 return (0); @@ -201,8 +194,8 @@ envlist_unsetenv(envlist_t *envlist, const char *env) } if (entry !=3D NULL) { QLIST_REMOVE(entry, ev_link); - free((char *)entry->ev_var); - free(entry); + g_free((char *)entry->ev_var); + g_free(entry); =20 envlist->el_count--; } @@ -212,12 +205,12 @@ envlist_unsetenv(envlist_t *envlist, const char *env) /* * Returns given envlist as array of strings (in same form that * global variable environ is). Caller must free returned memory - * by calling free(3) for each element and for the array. Returned - * array and given envlist are not related (no common references). + * by calling g_free for each element and the array. + * Returned array and given envlist are not related (no common + * references). * * If caller provides count pointer, number of items in array is - * stored there. In case of error, NULL is returned and no memory - * is allocated. + * stored there. */ char ** envlist_to_environ(const envlist_t *envlist, size_t *count) @@ -225,13 +218,11 @@ envlist_to_environ(const envlist_t *envlist, size_t *= count) struct envlist_entry *entry; char **env, **penv; =20 - penv =3D env =3D malloc((envlist->el_count + 1) * sizeof (char *)); - if (env =3D=3D NULL) - return (NULL); + penv =3D env =3D g_malloc((envlist->el_count + 1) * sizeof(char *)); =20 for (entry =3D envlist->el_entries.lh_first; entry !=3D NULL; entry =3D entry->ev_link.le_next) { - *(penv++) =3D strdup(entry->ev_var); + *(penv++) =3D g_strdup(entry->ev_var); } *penv =3D NULL; /* NULL terminate the list */ =20 --=20 2.12.0