[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/64] slirp: replace the poor-man string split with
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 10/64] slirp: replace the poor-man string split with g_strsplit() |
Date: |
Wed, 19 Dec 2018 00:03:48 +0100 |
From: Marc-André Lureau <address@hidden>
Use the glib function for the work, fix a potential crash on >256 words.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
slirp/misc.c | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/slirp/misc.c b/slirp/misc.c
index ce323ef92e..4840187750 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -88,11 +88,8 @@ fork_exec(struct socket *so, const char *ex)
socklen_t addrlen = sizeof(addr);
socklen_t csaddrlen = sizeof(csaddr);
int opt;
- const char *argv[256];
- /* don't want to clobber the original */
- char *bptr;
- const char *curarg;
- int c, i, ret;
+ char **argv;
+ int ret;
pid_t pid;
DEBUG_CALL("fork_exec");
@@ -156,19 +153,7 @@ fork_exec(struct socket *so, const char *ex)
for (s = getdtablesize() - 1; s >= 3; s--)
close(s);
- i = 0;
- bptr = g_strdup(ex); /* No need to free() this */
- do {
- /* Change the string into argv[] */
- curarg = bptr;
- while (*bptr != ' ' && *bptr != (char)0)
- bptr++;
- c = *bptr;
- *bptr++ = (char)0;
- argv[i++] = g_strdup(curarg);
- } while (c);
-
- argv[i] = NULL;
+ argv = g_strsplit(ex, " ", -1);
execvp(argv[0], (char **)argv);
/* Ooops, failed, let's tell the user why */
--
2.19.2
- [Qemu-devel] [PULL 14/64] slirp: remove unused M_TRAILINGSPACE, (continued)
- [Qemu-devel] [PULL 14/64] slirp: remove unused M_TRAILINGSPACE, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 24/64] slirp: remove unused HAVE_SYS_WAIT_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 13/64] slirp: move socket pair creation in helper function, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 20/64] slirp: remove unused HAVE_SYS_BITYPES_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 06/64] slirp: rename /extra/chardev, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 18/64] slirp: remove the disabled readv()/writev() code path, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 17/64] slirp: remove FULL_BOLT, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 29/64] slirp: remove unused HAVE_INET_ATON, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 23/64] slirp: remove unused HAVE_ARPA_INET_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 16/64] slirp: remove PROBE_CONN dead-code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 10/64] slirp: replace the poor-man string split with g_strsplit(),
Samuel Thibault <=
- [Qemu-devel] [PULL 08/64] slirp: remove Monitor dependency, return a string for info, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 21/64] slirp: remove NO_UNIX_SOCKETS, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 36/64] slirp: add a callback to log guest errors, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 30/64] slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 26/64] slirp: remove HAVE_SYS_IOCTL_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 33/64] slirp: remove unused global slirp_instance, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 42/64] net: do not depend on slirp internals, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 34/64] slirp: replace error_report() with g_critical(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 27/64] slirp: remove HAVE_SYS_FILIO_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 25/64] slirp: remove unused HAVE_SYS_SELECT_H, Samuel Thibault, 2018/12/18