Patchwork D2669: util: fix unsafe url abort with bytestr() on url

login
register
mail settings
Submitter phabricator
Date March 4, 2018, 9:44 p.m.
Message ID <6af2461d87e3ffccd7cd826b9b2f8e25@localhost.localdomain>
Download mbox | patch
Permalink /patch/29012/
State Not Applicable
Headers show

Comments

phabricator - March 4, 2018, 9:44 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGca201470abb4: util: fix unsafe url abort with bytestr() on url (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2669?vs=6612&id=6621

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

AFFECTED FILES
  mercurial/util.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -3097,7 +3097,7 @@ 
     path = urlreq.unquote(path)
     if path.startswith('ssh://-') or path.startswith('svn+ssh://-'):
         raise error.Abort(_('potentially unsafe url: %r') %
-                          (path,))
+                          (pycompat.bytestr(path),))
 
 def hidepassword(u):
     '''hide user credential in a url string'''