SF.net SVN: geany:[4898] trunk

[ntrel at users.sourceforge.net]

Revision: 4898
          http://geany.svn.sourceforge.net/geany/?rev=4898&view=rev
Author:   ntrel
Date:     2010-05-11 11:49:09 +0000 (Tue, 11 May 2010)

Log Message:
-----------
Fix search_find_text not returning -1 when match is out of range.
This fixes invalid memory reads and wrong template filename
wildcard replacement.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/search.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-05-10 21:52:43 UTC (rev 4897)
+++ trunk/ChangeLog	2010-05-11 11:49:09 UTC (rev 4898)
@@ -1,3 +1,11 @@
+2010-05-11  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/search.c:
+   Fix search_find_text not returning -1 when match is out of range.
+   This fixes invalid memory reads and wrong template filename
+   wildcard replacement.
+
+
 2010-05-10  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/dialogs.c:

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2010-05-10 21:52:43 UTC (rev 4897)
+++ trunk/src/search.c	2010-05-11 11:49:09 UTC (rev 4898)
@@ -1777,14 +1777,15 @@
 
 	pos = ttf->chrg.cpMin;
 	ret = find_regex(sci, pos, &regex);
+	regfree(&regex);
 
 	if (ret >= 0 && ret < ttf->chrg.cpMax)
 	{
 		ttf->chrgText.cpMin = regex_matches[0].rm_so + pos;
 		ttf->chrgText.cpMax = regex_matches[0].rm_eo + pos;
+		return ret;
 	}
-	regfree(&regex);
-	return ret;
+	return -1;
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.