From: mmcc@openbsd.org Date: Fri, 16 Oct 2015 17:07:24 +0000 (+0000) Subject: upstream commit X-Git-Tag: V_7_2_P1~148 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e92c499a75477ecfe94dd7b4aed89f20b1fac5a7;p=thirdparty%2Fopenssh-portable.git upstream commit 0 -> NULL when comparing with a char*. ok dtucker@, djm@. Upstream-ID: a928e9c21c0a9020727d99738ff64027c1272300 --- diff --git a/scp.c b/scp.c index 593fe89bd..842dc66a9 100644 --- a/scp.c +++ b/scp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.182 2015/04/24 01:36:00 deraadt Exp $ */ +/* $OpenBSD: scp.c,v 1.183 2015/10/16 17:07:24 mmcc Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -866,7 +866,7 @@ rsource(char *name, struct stat *statp) return; } last = strrchr(name, '/'); - if (last == 0) + if (last == NULL) last = name; else last++;