diff options
| -rw-r--r-- | api/src/glfs-resolve.c | 17 | 
1 files changed, 10 insertions, 7 deletions
diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c index e7dd7dca102..88e2d8926a0 100644 --- a/api/src/glfs-resolve.c +++ b/api/src/glfs-resolve.c @@ -472,14 +472,13 @@ priv_glfs_resolve_at (struct glfs *fs, xlator_t *subvol, inode_t *at,  	DECLARE_OLD_THIS;  	__GLFS_ENTRY_VALIDATE_FS(fs, invalid_fs); -	path = gf_strdup (origpath); -	if (!path) { -		errno = ENOMEM; -		return -1; -	} +        if (origpath[0] == '\0') { +                errno = EINVAL; +                goto invalid_fs; +        }  	parent = NULL; -	if (at && path[0] != '/') { +	if (at && origpath[0] != '/') {  		/* A relative resolution of a path which starts with '/'  		   is equal to an absolute path resolution.  		*/ @@ -487,10 +486,14 @@ priv_glfs_resolve_at (struct glfs *fs, xlator_t *subvol, inode_t *at,  	} else {  		inode = inode_ref (subvol->itable->root); -		if (strcmp (path, "/") == 0) +		if (strcmp (origpath, "/") == 0)                          glfs_resolve_root (fs, subvol, inode, &ciatt);  	} +        path = gf_strdup (origpath); +	if (!path) +		goto invalid_fs; +  	for (component = strtok_r (path, "/", &saveptr);  	     component; component = next_component) {  | 
