Attachment 155554 Details for Bug 199382 – Proposed patch (since 381441 revision)

[patch] Proposed patch (since 381441 revision)

tig_2.1-2.1.1.diff (text/plain), 2.28 KB, created by lightside on 2015-04-13 17:17:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-04-13 17:17:11 UTC

Size: 2.28 KB

patch

obsolete

>diff -ruN tig.orig/Makefile tig/Makefile
>--- tig.orig/Makefile	2015-03-17 00:36:49.000000000 +0400
>+++ tig/Makefile	2015-04-12 01:25:00.000000000 +0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/tig/Makefile 381441 2015-03-16 20:36:49Z amdmi3 $
> 
> PORTNAME=	tig
>-PORTVERSION=	2.1
>+PORTVERSION=	2.1.1
> CATEGORIES=	devel
> MASTER_SITES=	http://jonas.nitro.dk/tig/releases/
> 
>diff -ruN tig.orig/distinfo tig/distinfo
>--- tig.orig/distinfo	2015-03-17 00:36:49.000000000 +0400
>+++ tig/distinfo	2015-04-12 01:25:28.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (tig-2.1.tar.gz) = 306287f684f57563a53abf1cf46149e0d30c6b500fbc0c39e9bc059506373cb0
>-SIZE (tig-2.1.tar.gz) = 635114
>+SHA256 (tig-2.1.1.tar.gz) = 50c5179fd564b829b6b2cec087e66f10cf8799601de19350df0772ae77e4852f
>+SIZE (tig-2.1.1.tar.gz) = 641710
>diff -ruN tig.orig/files/patch-config.make.in tig/files/patch-config.make.in
>--- tig.orig/files/patch-config.make.in	2014-05-13 19:56:15.000000000 +0400
>+++ tig/files/patch-config.make.in	2015-04-13 20:07:44.000000000 +0400
>@@ -1,7 +1,7 @@
>---- ./config.make.in.orig	2014-05-10 09:51:50.000000000 +0800
>-+++ ./config.make.in	2014-05-10 09:53:07.000000000 +0800
>-@@ -12,7 +12,7 @@
>- CFLAGS = @CFLAGS@
>+--- config.make.in.orig	2015-04-09 00:19:11 UTC
>++++ config.make.in
>+@@ -12,7 +12,7 @@ CC = @CC@
>+ CFLAGS = @CFLAGS@ @COVERAGE_CFLAGS@
>  CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H
>  LDFLAGS = @LDFLAGS@
> -LDLIBS = @LIBS@ @CURSES_LIB@
>diff -ruN tig.orig/files/patch-src_ui.c tig/files/patch-src_ui.c
>--- tig.orig/files/patch-src_ui.c	1970-01-01 03:00:00.000000000 +0300
>+++ tig/files/patch-src_ui.c	2015-04-13 20:08:25.000000000 +0400
>@@ -0,0 +1,14 @@
>+# Origin: https://github.com/jonas/tig/commit/718c6e94fcc111e5607d6ca0bf3d15271adc0d97
>+# Subject: ui: fix crash due to out-of-bounds array access
>+
>+--- src/ui.c.orig	2015-04-09 00:19:11 UTC
>++++ src/ui.c
>+@@ -293,7 +293,7 @@ open_file_finder(const char *commit)
>+ 	finder.keymap = get_keymap("search", STRING_SIZE("search")),
>+ 	file_finder_update(&finder);
>+ 	file_finder_draw(&finder);
>+-	if (read_prompt_incremental("Find file: ", FALSE, file_finder_input_handler, &finder))
>++	if (read_prompt_incremental("Find file: ", FALSE, file_finder_input_handler, &finder) && finder.pos.lineno < finder.lines)
>+ 		file = get_path(finder.line[finder.pos.lineno]->text);
>+ 
>+ 	file_finder_done(&finder);

Actions: View | Diff

Attachments on bug 199382: 155484 | 155485 | 155554