From 32c6e78c6c4c13b63d8dc30aa395cfcc6e686c0a Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Thu, 5 Jun 2014 18:46:28 +0200
Subject: upas: fix nil pointer dereference

R=rsc
https://codereview.appspot.com/92650043
---
 src/cmd/upas/smtp/smtp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/cmd/upas')

diff --git a/src/cmd/upas/smtp/smtp.c b/src/cmd/upas/smtp/smtp.c
index 62ef865e..9dd05596 100644
--- a/src/cmd/upas/smtp/smtp.c
+++ b/src/cmd/upas/smtp/smtp.c
@@ -229,7 +229,7 @@ threadmain(int argc, char **argv)
 	for(i = 0; i < argc; i++){
 		if((trv = rcptto(argv[i])) != 0){
 			/* remember worst error */
-			if(strcmp(rv, Giveup) != 0)
+			if(rv != nil && strcmp(rv, Giveup) != 0)
 				rv = trv;
 			errs[rcvrs] = strdup(s_to_c(reply));
 			removenewline(errs[rcvrs]);
@@ -241,7 +241,7 @@ threadmain(int argc, char **argv)
 	}
 
 	/* if no ok rcvrs or worst error is retry, give up */
-	if(ok == 0 || strcmp(rv, Retry) == 0)
+	if(ok == 0 || (rv != nil && strcmp(rv, Retry) == 0))
 		goto error;
 
 	if(ping){
-- 
cgit v1.2.3