From d566fccb1eb32fcff12d07623199bed7a22ffea7 Mon Sep 17 00:00:00 2001 From: FrozenCow Date: Wed, 9 Feb 2011 13:25:06 +0100 Subject: [PATCH 1/2] Fixed rendering zoomedout tiles. --- src/main/java/org/dynmap/kzedmap/ZoomedTileRenderer.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/dynmap/kzedmap/ZoomedTileRenderer.java b/src/main/java/org/dynmap/kzedmap/ZoomedTileRenderer.java index c8e746e7..793624a6 100644 --- a/src/main/java/org/dynmap/kzedmap/ZoomedTileRenderer.java +++ b/src/main/java/org/dynmap/kzedmap/ZoomedTileRenderer.java @@ -29,7 +29,6 @@ public class ZoomedTileRenderer { try { image = ImageIO.read(new File(new File(outputPath), originalTile.getName() + ".png")); } catch (IOException e) { - return; } if (image == null) { @@ -42,7 +41,6 @@ public class ZoomedTileRenderer { try { zIm = ImageIO.read(zoomFile); } catch (IOException e) { - return; } if (zIm == null) { From 29517e9a242004aee0d59b703d3270bf39119e87 Mon Sep 17 00:00:00 2001 From: FrozenCow Date: Wed, 9 Feb 2011 17:22:16 +0100 Subject: [PATCH 2/2] Fixed handling invalid http requests. --- src/main/java/org/dynmap/web/HttpServerConnection.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/dynmap/web/HttpServerConnection.java b/src/main/java/org/dynmap/web/HttpServerConnection.java index 7e7647cb..5fefc144 100644 --- a/src/main/java/org/dynmap/web/HttpServerConnection.java +++ b/src/main/java/org/dynmap/web/HttpServerConnection.java @@ -29,7 +29,10 @@ public class HttpServerConnection extends Thread { private static boolean readRequestHeader(InputStream in, HttpRequest request) throws IOException { BufferedReader r = new BufferedReader(new InputStreamReader(in)); - Matcher m = requestHeaderLine.matcher(r.readLine()); + String statusLine = r.readLine(); + if (statusLine == null) + return false; + Matcher m = requestHeaderLine.matcher(statusLine); if (!m.matches()) return false; request.method = m.group(1);