LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 7d8262cb: am 6948cb40: Merge "Harden NsdManager against null-dereference crashes"

Browse Source 
* commit '7d8262cb554c41892794f23b92e01b52458288bb':
  Harden NsdManager against null-dereference crashes
This commit is contained in:
Dave Platt
2014-03-04 22:02:55 +00:00
committed by Android Git Automerger
parent 59e808f549 6948cb4073
commit b4a78de40f
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/java/android/net/nsd/NsdManager.java
View File

@@ -301,27 +301,36 @@ public final class NsdManager {
@Override @Override
public void handleMessage(Message message) { public void handleMessage(Message message) {
Object listener = getListener(message.arg2);
boolean listenerRemove = true;
switch (message.what) { switch (message.what) {
case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED: case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED:
mAsyncChannel.sendMessage(AsyncChannel.CMD_CHANNEL_FULL_CONNECTION); mAsyncChannel.sendMessage(AsyncChannel.CMD_CHANNEL_FULL_CONNECTION);
break; return;
case AsyncChannel.CMD_CHANNEL_FULLY_CONNECTED: case AsyncChannel.CMD_CHANNEL_FULLY_CONNECTED:
mConnected.countDown(); mConnected.countDown();
break; return;
case AsyncChannel.CMD_CHANNEL_DISCONNECTED: case AsyncChannel.CMD_CHANNEL_DISCONNECTED:
Log.e(TAG, "Channel lost"); Log.e(TAG, "Channel lost");
return;
default:
break; break;
}
Object listener = getListener(message.arg2);
if (listener == null) {
Log.d(TAG, "Stale key " + message.arg2);
return;
}
boolean listenerRemove = true;
NsdServiceInfo ns = getNsdService(message.arg2);
switch (message.what) {
case DISCOVER_SERVICES_STARTED: case DISCOVER_SERVICES_STARTED:
String s = ((NsdServiceInfo) message.obj).getServiceType(); String s = getNsdServiceInfoType((NsdServiceInfo) message.obj);
((DiscoveryListener) listener).onDiscoveryStarted(s); ((DiscoveryListener) listener).onDiscoveryStarted(s);
// Keep listener until stop discovery // Keep listener until stop discovery
listenerRemove = false; listenerRemove = false;
break; break;
case DISCOVER_SERVICES_FAILED: case DISCOVER_SERVICES_FAILED:
((DiscoveryListener) listener).onStartDiscoveryFailed( ((DiscoveryListener) listener).onStartDiscoveryFailed(getNsdServiceInfoType(ns),
getNsdService(message.arg2).getServiceType(), message.arg1); message.arg1);
break; break;
case SERVICE_FOUND: case SERVICE_FOUND:
((DiscoveryListener) listener).onServiceFound((NsdServiceInfo) message.obj); ((DiscoveryListener) listener).onServiceFound((NsdServiceInfo) message.obj);
@@ -334,16 +343,14 @@ public final class NsdManager {
listenerRemove = false; listenerRemove = false;
break; break;
case STOP_DISCOVERY_FAILED: case STOP_DISCOVERY_FAILED:
((DiscoveryListener) listener).onStopDiscoveryFailed( ((DiscoveryListener) listener).onStopDiscoveryFailed(getNsdServiceInfoType(ns),
getNsdService(message.arg2).getServiceType(), message.arg1); message.arg1);
break; break;
case STOP_DISCOVERY_SUCCEEDED: case STOP_DISCOVERY_SUCCEEDED:
((DiscoveryListener) listener).onDiscoveryStopped( ((DiscoveryListener) listener).onDiscoveryStopped(getNsdServiceInfoType(ns));
getNsdService(message.arg2).getServiceType());
break; break;
case REGISTER_SERVICE_FAILED: case REGISTER_SERVICE_FAILED:
((RegistrationListener) listener).onRegistrationFailed( ((RegistrationListener) listener).onRegistrationFailed(ns, message.arg1);
getNsdService(message.arg2), message.arg1);
break; break;
case REGISTER_SERVICE_SUCCEEDED: case REGISTER_SERVICE_SUCCEEDED:
((RegistrationListener) listener).onServiceRegistered( ((RegistrationListener) listener).onServiceRegistered(
@@ -352,16 +359,13 @@ public final class NsdManager {
listenerRemove = false; listenerRemove = false;
break; break;
case UNREGISTER_SERVICE_FAILED: case UNREGISTER_SERVICE_FAILED:
((RegistrationListener) listener).onUnregistrationFailed( ((RegistrationListener) listener).onUnregistrationFailed(ns, message.arg1);
getNsdService(message.arg2), message.arg1);
break; break;
case UNREGISTER_SERVICE_SUCCEEDED: case UNREGISTER_SERVICE_SUCCEEDED:
((RegistrationListener) listener).onServiceUnregistered( ((RegistrationListener) listener).onServiceUnregistered(ns);
getNsdService(message.arg2));
break; break;
case RESOLVE_SERVICE_FAILED: case RESOLVE_SERVICE_FAILED:
((ResolveListener) listener).onResolveFailed( ((ResolveListener) listener).onResolveFailed(ns, message.arg1);
getNsdService(message.arg2), message.arg1);
break; break;
case RESOLVE_SERVICE_SUCCEEDED: case RESOLVE_SERVICE_SUCCEEDED:
((ResolveListener) listener).onServiceResolved((NsdServiceInfo) message.obj); ((ResolveListener) listener).onServiceResolved((NsdServiceInfo) message.obj);
@@ -421,6 +425,11 @@ public final class NsdManager {
} }
private String getNsdServiceInfoType(NsdServiceInfo s) {
if (s == null) return "?";
return s.getServiceType();
}
/** /**
* Initialize AsyncChannel * Initialize AsyncChannel
*/ */