upstream/mercurial-mirror Files · contrib/fuzz/pyutil.cc

py3: avoid iterating over a literal bytes in highlight...

py3: avoid iterating over a literal bytes in highlight In Python 3, iterating over a bytes literal yields integers. Since we use the value in `text.replace()`, this fails on Python 3 with the following trackback: Traceback (most recent call last): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgwebdir_mod.py", line 378, in run_wsgi for r in self._runwsgi(req, res): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgweb_mod.py", line 326, in run_wsgi for r in self._runwsgi(req, res, repo): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgweb_mod.py", line 449, in _runwsgi return getattr(webcommands, cmd)(rctx) File "/usr/lib/python3/dist-packages/mercurial/hgweb/webcommands.py", line 211, in file return _filerevision(web, webutil.filectx(web.repo, web.req)) File "/usr/lib/python3/dist-packages/hgext/highlight/__init__.py", line 72, in filerevision_highlight pygmentize(web, b'fileline', fctx, web.tmpl) File "/usr/lib/python3/dist-packages/hgext/highlight/__init__.py", line 58, in pygmentize field, fctx, style, tmpl, guessfilenameonly=filenameonly File "/usr/lib/python3/dist-packages/hgext/highlight/highlight.py", line 62, in pygmentize text = text.replace(c, b'') TypeError: a bytes-like object is required, not 'int'

Augie Fackler - - Load All Authors

File last commit:

r41049:ef103c96 default


                r44014:856cce0c

stable

Download file

             pyutil.cc
        
                    49 lines
            
             | 1.2 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / contrib / fuzz / pyutil.cc
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #include "pyutil.h"

      #include <string>

      namespace contrib

      {

      static char cpypath[8192] = "\0";

      static PyObject *mainmod;

      static PyObject *globals;

      /* TODO: use Python 3 for this fuzzing? */

      PyMODINIT_FUNC initparsers(void);

      void initpy(const char *cselfpath)

      {

      	const std::string subdir = "/sanpy/lib/python2.7";

      	/* HACK ALERT: we need a full Python installation built without

      	   pymalloc and with ASAN, so we dump one in

      	   $OUT/sanpy/lib/python2.7. This helps us wire that up. */

      	std::string selfpath(cselfpath);

      	std::string pypath;

      	auto pos = selfpath.rfind("/");

      	if (pos == std::string::npos) {

      		char wd[8192];

      		getcwd(wd, 8192);

      		pypath = std::string(wd) + subdir;

      	} else {

      		pypath = selfpath.substr(0, pos) + subdir;

      	}

      	strncpy(cpypath, pypath.c_str(), pypath.size());

      	setenv("PYTHONPATH", cpypath, 1);

      	setenv("PYTHONNOUSERSITE", "1", 1);

      	/* prevent Python from looking up users in the fuzz environment */

      	setenv("PYTHONUSERBASE", cpypath, 1);

      	Py_SetPythonHome(cpypath);

      	Py_InitializeEx(0);

      	mainmod = PyImport_AddModule("__main__");

      	globals = PyModule_GetDict(mainmod);

      	initparsers();

      }

      PyObject *pyglobals()

      {

      	return globals;

      }

      } // namespace contrib

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#include "pyutil.h"

				#include <string>

				namespace contrib
				{

				static char cpypath[8192] = "\0";

				static PyObject *mainmod;
				static PyObject *globals;

				/* TODO: use Python 3 for this fuzzing? */
				PyMODINIT_FUNC initparsers(void);

				void initpy(const char *cselfpath)
				{
				const std::string subdir = "/sanpy/lib/python2.7";
				/* HACK ALERT: we need a full Python installation built without
				pymalloc and with ASAN, so we dump one in
				$OUT/sanpy/lib/python2.7. This helps us wire that up. */
				std::string selfpath(cselfpath);
				std::string pypath;
				auto pos = selfpath.rfind("/");
				if (pos == std::string::npos) {
				char wd[8192];
				getcwd(wd, 8192);
				pypath = std::string(wd) + subdir;
				} else {
				pypath = selfpath.substr(0, pos) + subdir;
				}
				strncpy(cpypath, pypath.c_str(), pypath.size());
				setenv("PYTHONPATH", cpypath, 1);
				setenv("PYTHONNOUSERSITE", "1", 1);
				/* prevent Python from looking up users in the fuzz environment */
				setenv("PYTHONUSERBASE", cpypath, 1);
				Py_SetPythonHome(cpypath);
				Py_InitializeEx(0);
				mainmod = PyImport_AddModule("__main__");
				globals = PyModule_GetDict(mainmod);
				initparsers();
				}

				PyObject *pyglobals()
				{
				return globals;
				}

				} // namespace contrib