fixed npe cause by racing condition TooTallNate#205

Davidiusdadi · Davidiusdadi · commit aef92290adbd · 2013-09-22T22:21:58.000+02:00
diff --git a/src/main/java/org/java_websocket/WebSocketAdapter.java b/src/main/java/org/java_websocket/WebSocketAdapter.java
@@ -1,7 +1,10 @@
 package org.java_websocket;
 
+import java.net.InetSocketAddress;
+
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.exceptions.InvalidDataException;
+import org.java_websocket.exceptions.InvalidHandshakeException;
 import org.java_websocket.framing.Framedata;
 import org.java_websocket.framing.Framedata.Opcode;
 import org.java_websocket.framing.FramedataImpl1;
@@ -79,12 +82,23 @@ public void onWebsocketPong( WebSocket conn, Framedata f ) {
 	 * This is specifically implemented for gitime's WebSocket client for Flash:
 	 * http://github.com/gimite/web-socket-js
 	 * 
-	 * @return An XML String that comforms to Flash's security policy. You MUST
+	 * @return An XML String that comforts to Flash's security policy. You MUST
 	 *         not include the null char at the end, it is appended automatically.
+	 * @throws InvalidDataException thrown when some data that is required to generate the flash-policy like the websocket local port could not be obtained e.g because the websocket is not connected.
 	 */
 	@Override
-	public String getFlashPolicy( WebSocket conn ) {
-		return "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"" + conn.getLocalSocketAddress().getPort() + "\" /></cross-domain-policy>\0";
+	public String getFlashPolicy( WebSocket conn ) throws InvalidDataException {
+		InetSocketAddress adr = conn.getLocalSocketAddress();
+		if(null == adr){
+			throw new InvalidHandshakeException( "socket not bound" );
+		}
+		
+		StringBuffer sb = new StringBuffer( 90 );
+		sb.append( "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"" );
+		sb.append(adr.getPort());
+		sb.append( "\" /></cross-domain-policy>\0" );
+		
+		return sb.toString();
 	}
 
 }
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -198,8 +198,12 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) {
 			if( draft == null ) {
 				HandshakeState isflashedgecase = isFlashEdgeCase( socketBuffer );
 				if( isflashedgecase == HandshakeState.MATCHED ) {
-					write( ByteBuffer.wrap( Charsetfunctions.utf8Bytes( wsl.getFlashPolicy( this ) ) ) );
-					close( CloseFrame.FLASHPOLICY, "" );
+					try {
+						write( ByteBuffer.wrap( Charsetfunctions.utf8Bytes( wsl.getFlashPolicy( this ) ) ) );
+						close( CloseFrame.FLASHPOLICY, "" );
+					} catch ( InvalidDataException e ) {
+						close( CloseFrame.ABNORMAL_CLOSE, "remote peer closed connection before flashpolicy could be transmitted", true );
+					}
 					return false;
 				}
 			}
diff --git a/src/main/java/org/java_websocket/WebSocketListener.java b/src/main/java/org/java_websocket/WebSocketListener.java
@@ -139,8 +139,9 @@ public interface WebSocketListener {
 	/**
 	 * Gets the XML string that should be returned if a client requests a Flash
 	 * security policy.
+	 * @throws InvalidDataException thrown when some data that is required to generate the flash-policy like the websocket local port could not be obtained.
 	 */
-	public String getFlashPolicy( WebSocket conn );
+	public String getFlashPolicy( WebSocket conn ) throws InvalidDataException;
 
 	/** This method is used to inform the selector thread that there is data queued to be written to the socket. */
 	public void onWriteDemand( WebSocket conn );
