X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=zxingorg%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fweb%2FDecodeServlet.java;fp=zxingorg%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fweb%2FDecodeServlet.java;h=e84c2cd341fe42338d3906de93a02ff63e88e9bf;hp=b5613507f06837cc3c0e9f9990df9bcfd0461974;hb=015a03392ad503c5d90ea63529e9bfe9cd2a12c2;hpb=74fded6d793e4a8a44f98d83a09af1ce0b271838

diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
index b5613507..e84c2cd3 100644
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -56,6 +56,7 @@ import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 
+import java.awt.color.CMMException;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
@@ -250,7 +251,17 @@ public final class DecodeServlet extends HttpServlet {
   private static void processStream(InputStream is, ServletRequest request,
       HttpServletResponse response) throws ServletException, IOException {
 
-    BufferedImage image = ImageIO.read(is);
+    BufferedImage image;
+    try {
+      image = ImageIO.read(is);
+    } catch (IOException ioe) {
+      response.sendRedirect("badimage.jspx");
+      return;
+    } catch (CMMException cmme) {
+      // Have seen this in logs
+      response.sendRedirect("badimage.jspx");
+      return;
+    }
     if (image == null) {
       response.sendRedirect("badimage.jspx");
       return;