summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-06-07 10:10:15 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-06-07 10:10:15 -0700
commit64caba3c021a9b86f093476b343df9bd3d3a4dbb (patch)
tree5baae424b243b66c16b38b14679593b91f6553f4
parent2a0279924b973308cb2a95cc92ab62b09b54cb3f (diff)
parent864e2e22fcd0cba3f5e67680ccabd0302dfda45d (diff)
downloadsystem_core-64caba3c021a9b86f093476b343df9bd3d3a4dbb.zip
system_core-64caba3c021a9b86f093476b343df9bd3d3a4dbb.tar.gz
system_core-64caba3c021a9b86f093476b343df9bd3d3a4dbb.tar.bz2
Merge tag 'android-6.0.1_r46' into HEAD
Android 6.0.1 release 46 # gpg: Signature made Mon 06 Jun 2016 10:39:22 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
-rw-r--r--sdcard/sdcard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 33b1509..98af250 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -337,7 +337,7 @@ static ssize_t get_node_path_locked(struct node* node, char* buf, size_t bufsize
ssize_t pathlen = 0;
if (node->parent && node->graft_path == NULL) {
- pathlen = get_node_path_locked(node->parent, buf, bufsize - namelen - 2);
+ pathlen = get_node_path_locked(node->parent, buf, bufsize - namelen - 1);
if (pathlen < 0) {
return -1;
}