diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-02-22 02:54:28 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-02-22 02:54:28 +0000 |
| commit | b05a570d69e06dab89aeb9418c6774fcb79c4e59 (patch) | |
| tree | b6fa978d14dd9ec7fab496b812246f9c1aa0c533 | |
| parent | f6f3cd59a9cedc552b55757a991cbb295360d8c9 (diff) | |
| download | attr-b05a570d69e06dab89aeb9418c6774fcb79c4e59.tar.gz | |
Fix a possible segfault from the attr list compat interfaces, thanks to Simon Munton.
Merge of master-melb:xfs-cmds:25263a by kenmcd.
| -rw-r--r-- | libattr/libattr.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libattr/libattr.c b/libattr/libattr.c index df39134..969c9f0 100644 --- a/libattr/libattr.c +++ b/libattr/libattr.c @@ -268,7 +268,7 @@ attr_list(const char *path, char *buffer, const int buffersize, int flags, attrlist_cursor_t *cursor) { const char *l; - int length, count = 0; + int length, vlength, count = 0; char lbuf[MAXLISTLEN]; char name[MAXNAMELEN+16]; unsigned int start_offset, end_offset; @@ -293,14 +293,14 @@ attr_list(const char *path, char *buffer, const int buffersize, int flags, if (api_unconvert(name, l, flags)) continue; if (flags & ATTR_DONTFOLLOW) - length = lgetxattr(path, l, NULL, 0); + vlength = lgetxattr(path, l, NULL, 0); else - length = getxattr(path, l, NULL, 0); - if (length < 0 && (errno == ENOATTR || errno == ENOTSUP)) + vlength = getxattr(path, l, NULL, 0); + if (vlength < 0 && (errno == ENOATTR || errno == ENOTSUP)) continue; if (count++ < cursor->opaque[0]) continue; - if (attr_list_pack(name, length, buffer, buffersize, + if (attr_list_pack(name, vlength, buffer, buffersize, &start_offset, &end_offset)) { cursor->opaque[0] = count; break; @@ -314,7 +314,7 @@ attr_listf(int fd, char *buffer, const int buffersize, int flags, attrlist_cursor_t *cursor) { const char *l; - int c, count = 0; + int length, vlength, count = 0; char lbuf[MAXLISTLEN]; char name[MAXNAMELEN+16]; unsigned int start_offset, end_offset; @@ -325,22 +325,22 @@ attr_listf(int fd, char *buffer, const int buffersize, int flags, } bzero(buffer, sizeof(attrlist_t)); - c = flistxattr(fd, lbuf, sizeof(lbuf)); - if (c < 0) - return c; + length = flistxattr(fd, lbuf, sizeof(lbuf)); + if (length < 0) + return length; start_offset = sizeof(attrlist_t); end_offset = buffersize & ~(8-1); /* 8 byte align */ - for (l = lbuf; l != lbuf + c; l = strchr(l, '\0') + 1) { + for (l = lbuf; l != lbuf + length; l = strchr(l, '\0') + 1) { if (api_unconvert(name, l, flags)) continue; - c = fgetxattr(fd, l, NULL, 0); - if (c < 0 && (errno == ENOATTR || errno == ENOTSUP)) + vlength = fgetxattr(fd, l, NULL, 0); + if (vlength < 0 && (errno == ENOATTR || errno == ENOTSUP)) continue; if (count++ < cursor->opaque[0]) continue; - if (attr_list_pack(name, c, buffer, buffersize, + if (attr_list_pack(name, vlength, buffer, buffersize, &start_offset, &end_offset)) { cursor->opaque[0] = count; break; |