mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid exception when someone scans a file:/// URL barcode. And don't process it.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2420 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-09-26 17:40:30 +00:00
parent 6c306ad1c7
commit 6a94fe7225
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/src/com/google/zxing/client/android/HttpHelper.java
View file

@ -90,7 +90,11 @@ public final class HttpHelper {
private static CharSequence downloadViaHttp(String uri, String contentTypes, int maxChars) throws IOException { private static CharSequence downloadViaHttp(String uri, String contentTypes, int maxChars) throws IOException {
Log.i(TAG, "Downloading " + uri); Log.i(TAG, "Downloading " + uri);
URL url = new URL(uri); URL url = new URL(uri);
HttpURLConnection connection = (HttpURLConnection) url.openConnection(); URLConnection conn = url.openConnection();
if (!(conn instanceof HttpURLConnection)) {
throw new IOException();
}
HttpURLConnection connection = (HttpURLConnection) conn;
connection.setRequestProperty("Accept", contentTypes); connection.setRequestProperty("Accept", contentTypes);
connection.setRequestProperty("Accept-Charset", "utf-8,*"); connection.setRequestProperty("Accept-Charset", "utf-8,*");
connection.setRequestProperty("User-Agent", "ZXing (Android)"); connection.setRequestProperty("User-Agent", "ZXing (Android)");
@ -151,7 +155,11 @@ public final class HttpHelper {
} }
URL url = uri.toURL(); URL url = uri.toURL();
HttpURLConnection connection = (HttpURLConnection) url.openConnection(); URLConnection conn = url.openConnection();
if (!(conn instanceof HttpURLConnection)) {
throw new IOException();
}
HttpURLConnection connection = (HttpURLConnection) conn;
connection.setInstanceFollowRedirects(false); connection.setInstanceFollowRedirects(false);
connection.setDoInput(false); connection.setDoInput(false);
connection.setRequestMethod("HEAD"); connection.setRequestMethod("HEAD");