Patchwork D7234: dirs: reject consecutive slashes in paths

login
register
mail settings
Submitter phabricator
Date Nov. 5, 2019, 11:46 p.m.
Message ID <acb675a1ee2c5d2b82ca848fc3f28d08@localhost.localdomain>
Download mbox | patch
Permalink /patch/42760/
State Not Applicable
Headers show

Comments

phabricator - Nov. 5, 2019, 11:46 p.m.
durin42 updated this revision to Diff 17564.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7234?vs=17563&id=17564

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7234/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7234

AFFECTED FILES
  mercurial/cext/dirs.c

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/cext/dirs.c b/mercurial/cext/dirs.c
--- a/mercurial/cext/dirs.c
+++ b/mercurial/cext/dirs.c
@@ -66,6 +66,11 @@ 
 	while ((pos = _finddir(cpath, pos - 1)) != -1) {
 		PyObject *val;
 
+		/* Sniff for trailing slashes, a marker of an invalid input. */
+		if (cpath[pos - 1] == '/') {
+			goto bail;
+		}
+
 		key = PyBytes_FromStringAndSize(cpath, pos);
 		if (key == NULL)
 			goto bail;