X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=execve.c;h=d2ff9f740435cf96320d61b3df8be1d4f5eaf6db;hb=8d3743868ebce77fe03c5b1ff6435baa8d084293;hp=a8f53f608031ee6d27cf307b87dbf48692e95f4a;hpb=7c2210190a26e9dee80aac76fa7f06adf1c21701;p=strace

diff --git a/execve.c b/execve.c
index a8f53f60..d2ff9f74 100644
--- a/execve.c
+++ b/execve.c
@@ -1,43 +1,107 @@
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993-1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 2007 Roland McGrath <roland@redhat.com>
+ * Copyright (c) 2011-2012 Denys Vlasenko <vda.linux@googlemail.com>
+ * Copyright (c) 2010-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "defs.h"
 
 static void
 printargv(struct tcb *tcp, long addr)
 {
-	union {
-		unsigned int p32;
-		unsigned long p64;
-		char data[sizeof(long)];
-	} cp;
-	const char *sep;
-	unsigned int n = 0;
-	const unsigned wordsize = current_wordsize;
-
-	cp.p64 = 1;
-	for (sep = ""; !abbrev(tcp) || n < max_strlen / 2; sep = ", ", ++n) {
-		if (umoven_or_printaddr(tcp, addr, wordsize, cp.data))
+	if (!addr || !verbose(tcp)) {
+		printaddr(addr);
+		return;
+	}
+
+	const char *const start_sep = "[";
+	const char *sep = start_sep;
+	const unsigned int wordsize = current_wordsize;
+	unsigned int n;
+
+	for (n = 0; addr; sep = ", ", addr += wordsize, ++n) {
+		union {
+			unsigned int p32;
+			unsigned long p64;
+			char data[sizeof(long)];
+		} cp;
+
+		if (umoven(tcp, addr, wordsize, cp.data)) {
+			if (sep == start_sep)
+				printaddr(addr);
+			else
+				tprints(", ???]");
 			return;
-		if (wordsize == 4)
-			cp.p64 = cp.p32;
-		if (cp.p64 == 0)
+		}
+		if (!(wordsize < sizeof(cp.p64) ? cp.p32 : cp.p64)) {
+			if (sep == start_sep)
+				tprints(start_sep);
+			break;
+		}
+		if (abbrev(tcp) && n >= max_strlen) {
+			tprintf("%s...", sep);
 			break;
+		}
 		tprints(sep);
-		printstr(tcp, cp.p64, -1);
-		addr += wordsize;
+		printstr(tcp, wordsize < sizeof(cp.p64) ? cp.p32 : cp.p64, -1);
 	}
-	if (cp.p64)
-		tprintf("%s...", sep);
+	tprints("]");
 }
 
 static void
-printargc(const char *fmt, struct tcb *tcp, long addr)
+printargc(struct tcb *tcp, long addr)
 {
-	int count;
+	if (!addr || !verbose(tcp)) {
+		printaddr(addr);
+		return;
+	}
+
+	bool unterminated = false;
+	unsigned int count = 0;
 	char *cp = NULL;
 
-	for (count = 0; !umoven(tcp, addr, current_wordsize, &cp) && cp; count++) {
-		addr += current_wordsize;
+	for (; addr; addr += current_wordsize, ++count) {
+		if (umoven(tcp, addr, current_wordsize, &cp)) {
+			if (count) {
+				unterminated = true;
+				break;
+			}
+			printaddr(addr);
+			return;
+		}
+		if (!cp)
+			break;
 	}
-	tprintf(fmt, count, count == 1 ? "" : "s");
+	tprintf("[/* %u var%s%s */]",
+		count, count == 1 ? "" : "s",
+		unterminated ? ", unterminated" : "");
 }
 
 static void
@@ -46,24 +110,10 @@ decode_execve(struct tcb *tcp, const unsigned int index)
 	printpath(tcp, tcp->u_arg[index + 0]);
 	tprints(", ");
 
-	if (!tcp->u_arg[index + 1] || !verbose(tcp))
-		printaddr(tcp->u_arg[index + 1]);
-	else {
-		tprints("[");
-		printargv(tcp, tcp->u_arg[index + 1]);
-		tprints("]");
-	}
+	printargv(tcp, tcp->u_arg[index + 1]);
 	tprints(", ");
 
-	if (!tcp->u_arg[index + 2] || !verbose(tcp))
-		printaddr(tcp->u_arg[index + 2]);
-	else if (abbrev(tcp))
-		printargc("[/* %d var%s */]", tcp, tcp->u_arg[index + 2]);
-	else {
-		tprints("[");
-		printargv(tcp, tcp->u_arg[index + 2]);
-		tprints("]");
-	}
+	(abbrev(tcp) ? printargc : printargv) (tcp, tcp->u_arg[index + 2]);
 }
 
 SYS_FUNC(execve)
@@ -88,13 +138,7 @@ SYS_FUNC(execv)
 {
 	printpath(tcp, tcp->u_arg[0]);
 	tprints(", ");
-	if (!tcp->u_arg[1] || !verbose(tcp))
-		printaddr(tcp->u_arg[1]);
-	else {
-		tprints("[");
-		printargv(tcp, tcp->u_arg[1]);
-		tprints("]");
-	}
+	printargv(tcp, tcp->u_arg[1]);
 
 	return RVAL_DECODED;
 }