Changeset 14893 in osm for applications/editors/josm

Timestamp:

2009-05-04T11:17:13+02:00 (15 years ago)

Author:

frederik

Message:

bugfix in remote control plugin to stop reading garbage after 1024 bytes

Location:

applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol

Files:

• RemoteControlPreferences.java (modified) (1 diff)
• RequestProcessor.java (modified) (2 diffs)

applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java

@@ -53 +53 @@
     }
 
-    public boolean ok() {
+    public void ok() {
         Main.pref.put("remotecontrol.permission.load-data", permissionLoadData.isSelected());
         Main.pref.put("remotecontrol.permission.change-selection", permissionChangeSelection.isSelected());
         Main.pref.put("remotecontrol.permission.change-viewport", permissionChangeViewport.isSelected());
         Main.pref.put("remotecontrol.always-confirm", alwaysAskUserConfirm.isSelected());
-        return false;
     }
 }

applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java

@@ -75 +75 @@
 
             StringBuffer requestLine = new StringBuffer();
-            while (true)
+            while (requestLine.length() < 1024)
             {
                 int c = in.read();
@@ -85 +85 @@
             String get = requestLine.toString();
             StringTokenizer st = new StringTokenizer(get);
+            if (!st.hasMoreTokens()) { sendError(out); return; }
             String method = st.nextToken();
+            if (!st.hasMoreTokens()) { sendError(out); return; }
             String url = st.nextToken();
 
-            if(!method.equals("GET")) {
+            if (!method.equals("GET")) {
                 sendNotImplemented(out);
                 return;