[Lxr-commits] CVS: lxr ident,1.24,1.25 search,1.33,1.34

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9463

Modified Files:
	ident search 
Log Message:
Fix for CVE-2009-4497 from Dan Rosenberg

Avoid a XSS vulnerability


Index: ident
===================================================================
RCS file: /cvsroot/lxr/lxr/ident,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ident	10 May 2009 11:54:29 -0000	1.24
+++ ident	5 Jan 2010 18:00:58 -0000	1.25
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/perl -T
 # $Id$
 
 # ident --	Look up identifiers
@@ -49,7 +49,7 @@
 	my $templ = shift;
 	my $ret   = '';
 
-	my @refs = $index->symdeclarations($identifier, $releaseid);
+	my @refs = $index->getindex($identifier, $release);
 
 	my $file_hits = 0;
 	my $last_file;
@@ -86,7 +86,7 @@
 	my $templ = shift;
 	my $ret   = '';
 
-	my @uses = $index->symreferences($identifier, $releaseid);
+	my @uses = $index->getreference($identifier, $release);
 	my $file_hits = 0;
 	my $last_file;
 	foreach my $ref (sort { $$a[0] cmp $$b[0] } @uses) {
@@ -146,8 +146,8 @@
 			$templ,
 			(
 				variables          => \&varinputs,
-				identifier         => sub { return $identifier },
-				identifier_escaped => sub { $_ = $identifier; s/\"/"/g; return $_; },
+				identifier         => sub { $_ = $identifier; s/</&lt;/g; s/>/&gt;/g; return $_; },
+				identifier_escaped => sub { $_ = $identifier; s/\"/&quot;/g; s/</&lt;/g; s/>/&gt;/g; return $_; },
 				refs => sub { refexpand(@_) },
 			)
 		)

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- search	10 May 2009 11:54:29 -0000	1.33
+++ search	5 Jan 2010 18:00:58 -0000	1.34
@@ -288,8 +288,8 @@
 		$templ,
 		(
 			variables          => sub { varinputs(@_) },
-			searchtext         => sub { return $searchtext },
-			searchtext_escaped => sub { $_ = $searchtext; s/\"/&quot;/g; return $_; },
+			searchtext         => sub { $_ = $searchtext; s/</&lt;/g; s/>/&gt;/g; return $_; },
+			searchtext_escaped => sub { $_ = $searchtext; s/\"/&quot;/g; s/</&lt;/g; s/>/&gt;/g; return $_; },
 			filetext_escaped   => sub { $_ = $filetext; s/\"/&quot;/g; return $_; },
 			advancedchecked      => sub { return $advanced      ? "checked" : "" },
 			casesensitivechecked => sub { return $casesensitive ? "checked" : "" },