Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3534dadd: docs: fix XSS vulnerability in search

Browse Source 
Merge commit '3534daddeefefbd42ea0a3819348327e5d85315c' into eclair

* commit '3534daddeefefbd42ea0a3819348327e5d85315c':
  docs: fix XSS vulnerability in search
This commit is contained in:
Scott Main
2009-10-28 23:32:13 -07:00
committed by Android Git Automerger
parent 4cb04c4654 3534daddee
commit 5eb80efb69
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/html/search.jd
View File

@@ -70,8 +70,8 @@ page.title=Search Results
searchControl.setSearchStartingCallback(this, function(control, searcher, query) { searchControl.setSearchStartingCallback(this, function(control, searcher, query) {
// save the tab index from the hash // save the tab index from the hash
tabIndex = location.hash.split("&t=")[1]; tabIndex = location.hash.split("&t=")[1];
$("#searchTitle").html("search results for <em>" + query + "</em>"); $("#searchTitle").html("search results for <em>" + escapeHTML(query) + "</em>");
$.history.add('q=' + query + '&t=' + tabIndex); $.history.add('q=' + query + '&t=' + tabIndex);
openTab(); openTab();
}); });
@@ -96,7 +96,8 @@ page.title=Search Results
$(window).history(function(e, hash) { $(window).history(function(e, hash) {
var query = decodeURI(getQuery(hash)); var query = decodeURI(getQuery(hash));
searchControl.execute(query); searchControl.execute(query);
$("#searchTitle").html("search results for <em>" + query + "</em>");
$("#searchTitle").html("search results for <em>" + escapeHTML(query) + "</em>");
}); });
// forcefully regain key-up event control (previously jacked by search api) // forcefully regain key-up event control (previously jacked by search api)
@@ -131,6 +132,13 @@ page.title=Search Results
return queryParts[1]; return queryParts[1];
} }
/* returns the given string with all HTML brackets converted to entities
TODO: move this to the site's JS library */
function escapeHTML(string) {
return string.replace(/</g,"&lt;")
.replace(/>/g,"&gt;");
}
</script> </script>
<div id="mainBodyFixed" style="width:auto; margin:20px"> <div id="mainBodyFixed" style="width:auto; margin:20px">