commit 1a5b6098d5002ae07ce3f9bc514400a87c2b64fa
author Irfan Sheriff <isheriff@google.com> Wed May 04 14:16:44 2011 -0700
committer Irfan Sheriff <isheriff@google.com> Wed May 04 14:23:42 2011 -0700
tree 86b84a16f4872fe4ee63f1d05f6439ac2db591db
parent 4ec33c2aad59b2a745ee891c9b7246b9533d95e0

Handle GET_POWER failures

Return a failure when GET_POWER returns a non-conforming
format

Bug: 4380317
Change-Id: If1ce73572ae261cd6998e4289e21112c88859437

core/jni/android_net_wifi_Wifi.cpp

diff --git a/core/jni/android_net_wifi_Wifi.cpp b/core/jni/android_net_wifi_Wifi.cpp
index fb029e6..35d8dc3 100644
--- a/core/jni/android_net_wifi_Wifi.cpp
+++ b/core/jni/android_net_wifi_Wifi.cpp
@@ -402,7 +402,9 @@
     }
     // reply comes back in the form "powermode = XX" where XX is the
     // number we're interested in.
-    sscanf(reply, "%*s = %u", &power);
+    if (sscanf(reply, "%*s = %u", &power) != 1) {
+        return (jint)-1;
+    }
     return (jint)power;
 }