Author: mav
Date: Thu Jun 27 14:26:57 2019
New Revision: 349458
URL: https://svnweb.freebsd.org/changeset/base/349458

Log:
  MFC r349376: Fix strsep_quote() on strings without quotes.
  
  For strings without quotes and escapes dstptr and srcptr are equal, so
  zeroing *dstptr before checking *srcptr is not a good idea.  In practice
  it means that in -maproot=65534:65533 everything after the colon is lost.
  
  The problem was there since r293305, but before r346976 it was covered by
  improper strsep_quote() usage.
  
  PR:   238725
  
  Approved by:  re (gjb)

Modified:
  releng/11.3/usr.sbin/mountd/mountd.c
Directory Properties:
  releng/11.3/   (props changed)

Modified: releng/11.3/usr.sbin/mountd/mountd.c
==============================================================================
--- releng/11.3/usr.sbin/mountd/mountd.c        Thu Jun 27 14:12:20 2019        
(r349457)
+++ releng/11.3/usr.sbin/mountd/mountd.c        Thu Jun 27 14:26:57 2019        
(r349458)
@@ -343,8 +343,8 @@ strsep_quote(char **stringp, const char *delim)
                *dstptr++ = *srcptr++;
        }
 
-       *dstptr = 0; /* Terminate the string */
        *stringp = (*srcptr == '\0') ? NULL : srcptr + 1;
+       *dstptr = 0; /* Terminate the string */
        return (retval);
 }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to