commit 8b262b9de4defd234ec3593453bfb1dba4642151
author Elliott Hughes <enh@google.com> Fri Jul 24 20:02:31 2015 -0700
committer Elliott Hughes <enh@google.com> Fri Jul 24 20:02:31 2015 -0700
tree 1491a533b5c6592858ddb8ba6432b39d75e8ec56
parent a6d23bd6d2c31c1de69a97d78ab1e557bedcc04a
parent 038b76c23e8b20b8fc620677d21e90bf430fef84

resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp

Change-Id: Id84946b67f207a7586cfa9c918ee6e4ae335fe86

libcutils/fs_config.c

diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index 08df9de..171d0f7 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -167,8 +167,7 @@
         if (target_out_path[target_out_path_len] == '/') {
             skip_len++;
         }
-        asprintf(&name, "%s%s", target_out_path, (dir ? conf_dir : conf_file) + skip_len);
-        if (name) {
+        if (asprintf(&name, "%s%s", target_out_path, (dir ? conf_dir : conf_file) + skip_len) != -1) {
             fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_BINARY));
             free(name);
         }