Code

builtin-push: don't access freed transport->url
authorTay Ray Chuan <rctay89@gmail.com>
Thu, 3 Dec 2009 23:31:44 +0000 (07:31 +0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Dec 2009 00:00:20 +0000 (16:00 -0800)
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 <rctay89@gmail.com>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-push.c

index 9846c638a611c07a98598464a7c72c4d8120fcea..03be045baed585d4d3996b0d16ea96cf79e2a584 100644 (file)
@@ -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"