From: Tay Ray Chuan Date: Thu, 3 Dec 2009 23:31:44 +0000 (+0800) Subject: builtin-push: don't access freed transport->url X-Git-Tag: v1.7.0-rc0~62^2~14 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53970b92d9dc883669f3a9b79b5e39e73931b331;p=git.git builtin-push: don't access freed transport->url Move the failed push message to before transport_disconnect() so that it doesn't access transport->url after transport has been free()'d (in transport_disconnect()). Additionally, make the failed push message more accurate by moving it before transport_disconnect(), so that it doesn't report errors due to a failed disconnect. Signed-off-by: Tay Ray Chuan Acked-by: Daniel Barkalow Signed-off-by: Junio C Hamano --- diff --git a/builtin-push.c b/builtin-push.c index 9846c638a..03be045ba 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -102,13 +102,14 @@ static int push_with_options(struct transport *transport, int flags) fprintf(stderr, "Pushing to %s\n", transport->url); err = transport_push(transport, refspec_nr, refspec, flags, &nonfastforward); + if (err != 0) + error("failed to push some refs to '%s'", transport->url); + err |= transport_disconnect(transport); if (!err) return 0; - error("failed to push some refs to '%s'", transport->url); - if (nonfastforward && advice_push_nonfastforward) { printf("To prevent you from losing history, non-fast-forward updates were rejected\n" "Merge the remote changes before pushing again. See the 'non-fast-forward'\n"