rpms/ctags/F-10 ctags-5.7-segment-fault.patch, NONE, 1.1 ctags.spec, 1.24, 1.25 sources, 1.11, 1.12

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/ctags/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24031

Modified Files:
	ctags.spec sources 
Added Files:
	ctags-5.7-segment-fault.patch 
Log Message:
- 5.8
- apply patch to fix segment fault, thanks to Masatake YAMATO


ctags-5.7-segment-fault.patch:
 vim.c |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE ctags-5.7-segment-fault.patch ---
diff -ruN -x '*~' ctags-5.7/vim.c ctags-5.7/vim.c
--- ctags-5.7/vim.c	2006-10-26 12:06:21.000000000 +0900
+++ ctags-5.7/vim.c	2009-08-28 22:21:31.000000000 +0900
@@ -328,7 +328,7 @@
 	 */
 	const unsigned char *cp = line;
 
-	if ( (int) *cp == '\\' ) 
+	if ( cp && ( (int) *cp == '\\' ) ) 
 	{
 		/*
 		 * We are recursively calling this function is the command
@@ -350,9 +350,10 @@
 		while (*cp && isspace ((int) *cp))
 			++cp; 
 	}
-	else if ( (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) && 
-		     (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) && 
-				(strncmp ((const char*) line, "com", (size_t) 3) == 0) )
+	else if ( line && 
+                     (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) && 
+		                (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) && 
+				          (strncmp ((const char*) line, "com", (size_t) 3) == 0) )
 	{
 		cp += 2;
 		if ((int) *++cp == 'm' && (int) *++cp == 'a' &&
@@ -394,6 +395,14 @@
 			while (*cp && !isspace ((int) *cp))
 				++cp; 
 		}
+		else if (!isalnum ((int) *cp))
+		{
+			/*
+			 * Broken syntax: throw away this line
+			 */
+			cmdProcessed = TRUE;
+			goto cleanUp;
+		}
 	} while ( *cp &&  !isalnum ((int) *cp) );
 
 	if ( ! *cp )


Index: ctags.spec
===================================================================
RCS file: /cvs/extras/rpms/ctags/F-10/ctags.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ctags.spec	29 Jul 2008 15:40:31 -0000	1.24
+++ ctags.spec	1 Sep 2009 09:56:42 -0000	1.25
@@ -1,11 +1,12 @@
 Summary: A C programming language indexing and/or cross-reference tool
 Name: ctags
-Version: 5.7
-Release: 3%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: ctags-5.7-destdir.patch
+Patch1: ctags-5.7-segment-fault.patch
 URL: http://ctags.sourceforge.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +42,7 @@ Note: some command line options is not c
 %prep
 %setup -q
 %patch0 -p1 -b .destdir
+%patch1 -p1 -b .crash
 
 %build
 %configure
@@ -83,6 +85,16 @@ rm -rf %{buildroot}
 %{_mandir}/man1/etags.%{name}.1*
 
 %changelog
+* Tue Sep 01 2009 Than Ngo <than at redhat.com> - 5.8-1
+- 5.8
+- apply patch to fix segment fault, thanks to Masatake YAMATO
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jul 29 2008 Than Ngo <than at redhat.com>  5.7-3
 - add subpackage ctags-etags
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctags/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Feb 2008 16:25:16 -0000	1.11
+++ sources	1 Sep 2009 09:56:42 -0000	1.12
@@ -1 +1 @@
-643cab63b39c8a24377dc4c781547d40  ctags-5.7.tar.gz
+c00f82ecdcc357434731913e5b48630d  ctags-5.8.tar.gz