@@ -76,7 +76,7 @@ static int is_nfs4_flags(const char *start, const char *end,
7676 int * result );
7777static int is_nfs4_perms (const char * start , const char * end ,
7878 int * result );
79- static void next_field (const char * * p , const char * * start ,
79+ static void next_field (const char * * p , size_t * l , const char * * start ,
8080 const char * * end , char * sep );
8181static void append_entry (char * * p , const char * prefix , int type ,
8282 int tag , int flags , const char * name , int perm , int id );
@@ -1619,6 +1619,13 @@ next_field_w(const wchar_t **wp, const wchar_t **start,
16191619int
16201620archive_acl_from_text_l (struct archive_acl * acl , const char * text ,
16211621 int want_type , struct archive_string_conv * sc )
1622+ {
1623+ return archive_acl_from_text_nl (acl , text , strlen (text ), want_type , sc );
1624+ }
1625+
1626+ int
1627+ archive_acl_from_text_nl (struct archive_acl * acl , const char * text ,
1628+ size_t length , int want_type , struct archive_string_conv * sc )
16221629{
16231630 struct {
16241631 const char * start ;
@@ -1649,15 +1656,15 @@ archive_acl_from_text_l(struct archive_acl *acl, const char *text,
16491656 ret = ARCHIVE_OK ;
16501657 types = 0 ;
16511658
1652- while (text != NULL && * text != '\0' ) {
1659+ while (text != NULL && length > 0 && * text != '\0' ) {
16531660 /*
16541661 * Parse the fields out of the next entry,
16551662 * advance 'text' to start of next entry.
16561663 */
16571664 fields = 0 ;
16581665 do {
16591666 const char * start , * end ;
1660- next_field (& text , & start , & end , & sep );
1667+ next_field (& text , & length , & start , & end , & sep );
16611668 if (fields < numfields ) {
16621669 field [fields ].start = start ;
16631670 field [fields ].end = end ;
@@ -2047,50 +2054,50 @@ is_nfs4_flags(const char *start, const char *end, int *permset)
20472054}
20482055
20492056/*
2050- * Match "[:whitespace:]*(.*)[:whitespace:]*[:,\n]". *wp is updated
2057+ * Match "[:whitespace:]*(.*)[:whitespace:]*[:,\n]". *p is updated
20512058 * to point to just after the separator. *start points to the first
20522059 * character of the matched text and *end just after the last
20532060 * character of the matched identifier. In particular *end - *start
20542061 * is the length of the field body, not including leading or trailing
20552062 * whitespace.
20562063 */
20572064static void
2058- next_field (const char * * p , const char * * start ,
2065+ next_field (const char * * p , size_t * l , const char * * start ,
20592066 const char * * end , char * sep )
20602067{
20612068 /* Skip leading whitespace to find start of field. */
2062- while (* * p == ' ' || * * p == '\t' || * * p == '\n' ) {
2069+ while (* l > 0 && ( * * p == ' ' || * * p == '\t' || * * p == '\n' ) ) {
20632070 (* p )++ ;
2071+ (* l )-- ;
20642072 }
20652073 * start = * p ;
20662074
2067- /* Scan for the separator. */
2068- while (* * p != '\0' && * * p != ',' && * * p != ':' && * * p != '\n' &&
2069- * * p != '#' ) {
2075+ /* Locate end of field, trim trailing whitespace if necessary */
2076+ while (* l > 0 && * * p != ' ' && * * p != '\t' && * * p != '\n' && * * p != ',' && * * p != ':' && * * p != '#' ) {
20702077 (* p )++ ;
2078+ (* l )-- ;
20712079 }
2072- * sep = * * p ;
2080+ * end = * p ;
20732081
2074- /* Locate end of field, trim trailing whitespace if necessary */
2075- if (* p == * start ) {
2076- * end = * p ;
2077- } else {
2078- * end = * p - 1 ;
2079- while (* * end == ' ' || * * end == '\t' || * * end == '\n' ) {
2080- (* end )-- ;
2081- }
2082- (* end )++ ;
2082+ /* Scan for the separator. */
2083+ while (* l > 0 && * * p != ',' && * * p != ':' && * * p != '\n' && * * p != '#' ) {
2084+ (* p )++ ;
2085+ (* l )-- ;
20832086 }
2087+ * sep = * * p ;
20842088
20852089 /* Handle in-field comments */
20862090 if (* sep == '#' ) {
2087- while (* * p != '\0' && * * p != ',' && * * p != '\n' ) {
2091+ while (* l > 0 && * * p != ',' && * * p != '\n' ) {
20882092 (* p )++ ;
2093+ (* l )-- ;
20892094 }
20902095 * sep = * * p ;
20912096 }
20922097
2093- /* Adjust scanner location . */
2094- if (* * p != '\0' )
2098+ /* Skip separator . */
2099+ if (* l > 0 ) {
20952100 (* p )++ ;
2101+ (* l )-- ;
2102+ }
20962103}
0 commit comments