am 1a5b609: Handle GET_POWER failures

isheriff · Android Git Automerger · commit 8a14d8b9c03c · 2011-05-04T21:14:47.000-07:00
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
  Handle GET_POWER failures
diff --git a/core/jni/android_net_wifi_Wifi.cpp b/core/jni/android_net_wifi_Wifi.cpp
@@ -402,7 +402,9 @@ static jint android_net_wifi_getPowerModeCommand(JNIEnv* env, jobject clazz)
     }
     // 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,9 @@ static jint android_net_wifi_getPowerModeCommand(JNIEnv* env, jobject clazz)`
`402`	`402`	`}`
`403`	`403`	`// reply comes back in the form "powermode = XX" where XX is the`
`404`	`404`	`// number we're interested in.`
`405`		`- sscanf(reply, "%*s = %u", &power);`
	`405`	`+ if (sscanf(reply, "%*s = %u", &power) != 1) {`
	`406`	`+ return (jint)-1;`
	`407`	`+ }`
`406`	`408`	`return (jint)power;`
`407`	`409`	`}`
`408`	`410`