From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUtGI-0004vA-Bx for qemu-devel@nongnu.org; Thu, 27 Aug 2015 05:14:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUtGE-0005PV-5K for qemu-devel@nongnu.org; Thu, 27 Aug 2015 05:14:22 -0400 Received: from mx2.parallels.com ([199.115.105.18]:60085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUtGD-0005NL-W7 for qemu-devel@nongnu.org; Thu, 27 Aug 2015 05:14:18 -0400 References: <1440632099-5169-1-git-send-email-marcandre.lureau@redhat.com> <1440632099-5169-5-git-send-email-marcandre.lureau@redhat.com> From: "Denis V. Lunev" Message-ID: <55DED4D6.8000508@openvz.org> Date: Thu, 27 Aug 2015 12:13:58 +0300 MIME-Version: 1.0 In-Reply-To: <1440632099-5169-5-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 04/13] qga: make split_list() return allocated strings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com On 08/27/2015 02:34 AM, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > In order to avoid any confusion, let's allocate new strings when > splitting. > > Signed-off-by: Marc-André Lureau > --- > qga/commands-posix.c | 6 +++--- > qga/commands-win32.c | 4 ++-- > qga/main.c | 22 +++++++++------------- > 3 files changed, 14 insertions(+), 18 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 675f4b4..fc4fc72 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -2454,7 +2454,7 @@ GList *ga_command_blacklist_init(GList *blacklist) > char **p = (char **)list; > > while (*p) { > - blacklist = g_list_append(blacklist, *p++); > + blacklist = g_list_append(blacklist, g_strdup(*p++)); > } > } > #endif > @@ -2468,13 +2468,13 @@ GList *ga_command_blacklist_init(GList *blacklist) > char **p = (char **)list; > > while (*p) { > - blacklist = g_list_append(blacklist, *p++); > + blacklist = g_list_append(blacklist, g_strdup(*p++)); > } > } > #endif > > #if !defined(CONFIG_FSTRIM) > - blacklist = g_list_append(blacklist, (char *)"guest-fstrim"); > + blacklist = g_list_append(blacklist, g_strdup("guest-fstrim")); > #endif > > return blacklist; > diff --git a/qga/commands-win32.c b/qga/commands-win32.c > index 77d3c92..cbee186 100644 > --- a/qga/commands-win32.c > +++ b/qga/commands-win32.c > @@ -1306,7 +1306,7 @@ GList *ga_command_blacklist_init(GList *blacklist) > char **p = (char **)list_unsupported; > > while (*p) { > - blacklist = g_list_append(blacklist, *p++); > + blacklist = g_list_append(blacklist, g_strdup(*p++)); > } > > if (!vss_init(true)) { > @@ -1317,7 +1317,7 @@ GList *ga_command_blacklist_init(GList *blacklist) > p = (char **)list; > > while (*p) { > - blacklist = g_list_append(blacklist, *p++); > + blacklist = g_list_append(blacklist, g_strdup(*p++)); > } > } > > diff --git a/qga/main.c b/qga/main.c > index e75022c..a7df6c8 100644 > --- a/qga/main.c > +++ b/qga/main.c > @@ -921,22 +921,17 @@ static void ga_print_cmd(QmpCommand *cmd, void *opaque) > printf("%s\n", qmp_command_name(cmd)); > } > > -static GList *split_list(gchar *str, const gchar separator) > +static GList *split_list(const gchar *str, const gchar *delim) > { > GList *list = NULL; > - int i, j, len; > + int i; > + gchar **strv; > > - for (j = 0, i = 0, len = strlen(str); i < len; i++) { > - if (str[i] == separator) { > - str[i] = 0; > - list = g_list_append(list, &str[j]); > - j = i + 1; > - } > - } > - > - if (j < i) { > - list = g_list_append(list, &str[j]); > + strv = g_strsplit(str, delim, -1); > + for (i = 0; strv[i]; i++) { > + list = g_list_prepend(list, strv[i]); > } > + g_free(strv); > > return list; > } > @@ -1021,7 +1016,7 @@ int main(int argc, char **argv) > qmp_for_each_command(ga_print_cmd, NULL); > exit(EXIT_SUCCESS); > } > - blacklist = g_list_concat(blacklist, split_list(optarg, ',')); > + blacklist = g_list_concat(blacklist, split_list(optarg, ",")); > break; > } > #ifdef _WIN32 > @@ -1201,6 +1196,7 @@ int main(int argc, char **argv) > } > #endif > > + g_list_free_full(ga_state->blacklist, g_free); > ga_command_state_cleanup_all(ga_state->command_state); > ga_channel_free(ga_state->channel); > Reviewed-by: Denis V. Lunev