commit b80bf5a4ae1c13bced8c024ec2d32253082c52c1
author Sasha Levitskiy <sanek@google.com> Tue Jun 23 00:20:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 23 00:20:42 2015 +0000
tree 841307b971686422329cfbf329b80cdeb38dff27
parent 6a2225839f0dd72f14d66f083e5b495e9be7488f
parent d0dbefc2dba19b3728b27ab8015019c535ad6707

Merge "Fingerprint: Safeguard against empty paths." into mnc-dev

fingerprintd/FingerprintDaemonProxy.cpp

diff --git a/fingerprintd/FingerprintDaemonProxy.cpp b/fingerprintd/FingerprintDaemonProxy.cpp
index a55f30a..4c8e478 100644
--- a/fingerprintd/FingerprintDaemonProxy.cpp
+++ b/fingerprintd/FingerprintDaemonProxy.cpp
@@ -160,8 +160,8 @@
 
 int32_t FingerprintDaemonProxy::setActiveGroup(int32_t groupId, const uint8_t* path,
         ssize_t pathlen) {
-    if (pathlen >= PATH_MAX) {
-        ALOGE("Path name is too long\n");
+    if (pathlen >= PATH_MAX || pathlen <= 0) {
+        ALOGE("Bad path length: %zd", pathlen);
         return -1;
     }
     // Convert to null-terminated string
@@ -170,7 +170,6 @@
     path_name[pathlen] = '\0';
     ALOG(LOG_VERBOSE, LOG_TAG, "setActiveGroup(%d, %s, %zu)", groupId, path_name, pathlen);
     return mDevice->set_active_group(mDevice, groupId, path_name);
-    return -1;
 }
 
 int64_t FingerprintDaemonProxy::openHal() {