am 92cb1a02: am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread
Merge commit '92cb1a026a2d6c594a63c18d8906271147eed85b'
* commit '92cb1a026a2d6c594a63c18d8906271147eed85b':
KeyStore: Fix the return value when send() or recv() has an error.
diff --git a/cmds/keystore/keystore_get.h b/cmds/keystore/keystore_get.h
index 141f69b..4b4923e 100644
--- a/cmds/keystore/keystore_get.h
+++ b/cmds/keystore/keystore_get.h
@@ -32,7 +32,7 @@
#endif
/* This function is provided for native components to get values from keystore.
- * Users are required to link against libcutils. Keys are values are 8-bit safe.
+ * Users are required to link against libcutils. Keys and values are 8-bit safe.
* The first two arguments are the key and its length. The third argument
* specifies the buffer to store the retrieved value, which must be an array of
* KEYSTORE_MESSAGE_SIZE bytes. This function returns the length of the value or
@@ -65,7 +65,10 @@
}
offset += n;
}
+ } else {
+ length = -1;
}
+
close(sock);
return length;
}