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

Some small improvements in error handling based on exceptions observed at zxing.org

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@538 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2008-07-30 21:58:17 +00:00
parent dbc1eebc49
commit 91b0ef1622
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/com/google/zxing/qrcode/detector/Detector.java
View file

@ -74,6 +74,9 @@ public final class Detector {
FinderPattern bottomLeft = info.getBottomLeft(); FinderPattern bottomLeft = info.getBottomLeft();
float moduleSize = calculateModuleSize(topLeft, topRight, bottomLeft); float moduleSize = calculateModuleSize(topLeft, topRight, bottomLeft);
if (moduleSize < 1.0f) {
throw new ReaderException("Module size too small");
}
int dimension = computeDimension(topLeft, topRight, bottomLeft, moduleSize); int dimension = computeDimension(topLeft, topRight, bottomLeft, moduleSize);
Version provisionalVersion = Version.getProvisionalVersionForDimension(dimension); Version provisionalVersion = Version.getProvisionalVersionForDimension(dimension);
int modulesBetweenFPCenters = provisionalVersion.getDimensionForVersion() - 7; int modulesBetweenFPCenters = provisionalVersion.getDimensionForVersion() - 7;

9
zxingorg/src/com/google/zxing/web/DecodeServlet.java
View file

@ -58,6 +58,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.Writer; import java.io.Writer;
import java.net.SocketException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@ -160,6 +161,14 @@ public final class DecodeServlet extends HttpServlet {
} finally { } finally {
is.close(); is.close();
} }
} catch (IllegalArgumentException iae) {
// Thrown if hostname is bad or null
getRequest.abort();
response.sendRedirect("badurl.jspx");
} catch (SocketException se) {
// Thrown if hostname is bad or null
getRequest.abort();
response.sendRedirect("badurl.jspx");
} catch (HttpException he) { } catch (HttpException he) {
getRequest.abort(); getRequest.abort();
response.sendRedirect("badurl.jspx"); response.sendRedirect("badurl.jspx");