src/org/adblockplus/android/AdblockPlus.java - Issue 9570024: ABP/Android Fix crash on unescaped uri

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: src/org/adblockplus/android/AdblockPlus.java

Issue 9570024: ABP/Android Fix crash on unescaped uri (Closed)

Patch Set: Created March 6, 2013, 2:55 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: src/org/adblockplus/android/AdblockPlus.java

===================================================================

--- a/src/org/adblockplus/android/AdblockPlus.java

+++ b/src/org/adblockplus/android/AdblockPlus.java

@@ -439,11 +439,11 @@

MatchesCallable(String url, String query, String reqHost, String refHost, String accept)

{

- this.url = url;

- this.query = query;

- this.reqHost = reqHost != null ? reqHost : "";

- this.refHost = refHost != null ? refHost : "";

- this.accept = accept != null ? accept : "";

+ this.url = StringEscapeUtils.escapeJavaScript(url);

+ this.query = StringEscapeUtils.escapeJavaScript(query);

+ this.reqHost = reqHost != null ? StringEscapeUtils.escapeJavaScript(reqHost) : "";

+ this.refHost = refHost != null ? StringEscapeUtils.escapeJavaScript(refHost) : "";

+ this.accept = accept != null ? StringEscapeUtils.escapeJavaScript(accept) : "";

}

@Override

« jni/jsEngine.cpp ('K') | « jni/jsEngine.cpp ('k') | no next file » | no next file with comments »