Merge branch 'maint-1.6.5' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Feb 2010 05:53:54 +0000 (21:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Feb 2010 05:53:54 +0000 (21:53 -0800)
* maint-1.6.5:
blame: prevent a segv when -L given start > EOF

1  2 
builtin-blame.c
diff --combined builtin-blame.c
index 6408ec8ee6805fc42eb5e5dc52be6463d62128bf,4094f3c06111e365c6ab6063746e5928bd2ee8a1..10f7eacf6e881cdb54a6b4a4c0aafc5f9751e5a9
@@@ -2365,7 -2365,6 +2365,7 @@@ parse_done
                        die_errno("cannot stat path '%s'", path);
        }
  
 +      revs.disable_stdin = 1;
        setup_revisions(argc, argv, &revs, NULL);
        memset(&sb, 0, sizeof(sb));
  
        if (top < 1)
                top = lno;
        bottom--;
-       if (lno < top)
+       if (lno < top || lno < bottom)
                die("file %s has only %lu lines", path, lno);
  
        ent = xcalloc(1, sizeof(*ent));