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

packaging: support building WiX installers with PyOxidizer...

packaging: support building WiX installers with PyOxidizer We initially implemented PyOxidizer support for Inno installers. That did most of the heavy work of integrating PyOxidizer into the packaging system. Implementing WiX installer support was pretty straightforward. Aspects of this patch look very similar to Inno's. The main difference is the handling of the Visual C++ Redistributable Runtime files. The WiX installer was formerly using merge modules to install the VC++ 9.0 runtime because this feature is supported by the WiX installer (it isn't easily available to Inno installers). Our strategy for the runtime files is to install the vcruntime140.dll file next to hg.exe just like any other file. While we could leverage WiX's functionality for invoking a VCRedist installer, I don't want to deal with the complexity at this juncture. So, we let run_pyoxidizer() copy vcruntime140.dll into the staging directory (like it does for Inno) and our dynamic WiX XML generator picks it up as a regular file and installs it. We did, however, have to teach mercurial.wxs how to conditionally use the merge modules. But this was rather straightforward. Comparing the file layout of the WiX installers before and after: * Various lib/*.{pyd, dll} files no longer exist * python27.dll was replaced by python37.dll * vcruntime140.dll was added All these changes are expected due to the transition to Python 3 and to PyOxidizer, which embeded the .pyd and .dll files in hg.exe. Differential Revision: https://phab.mercurial-scm.org/D8477

Augie Fackler - - Load All Authors

File last commit:

r44311:8766728d default


                r45274:234882d1

stable

Download file

             dirstate.cc
        
                    47 lines
            
             | 1.0 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / contrib / fuzz / dirstate.cc
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
fuzz: new fuzzer for dirstate parser...

              r41051
            
      #include <Python.h>

      #include <assert.h>

      #include <stdlib.h>

      #include <unistd.h>

      #include <string>

      #include "pyutil.h"

      extern "C" {

        Augie Fackler
    
fuzz: add support for fuzzing under either Python 2 or 3...

              r44311
            
      static PYCODETYPE *code;

        Augie Fackler
    
fuzz: new fuzzer for dirstate parser...

              r41051
            
      extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)

      {

      	contrib::initpy(*argv[0]);

        Augie Fackler
    
fuzz: add support for fuzzing under either Python 2 or 3...

              r44311
            
      	code = (PYCODETYPE *)Py_CompileString(R"py(

        Augie Fackler
    
fuzz: new fuzzer for dirstate parser...

              r41051
            
      try:

          dmap = {}

          copymap = {}

        Augie Fackler
    
fuzz: add support for fuzzing under either Python 2 or 3...

              r44311
            
          p = parsers.parse_dirstate(dmap, copymap, data)

        Augie Fackler
    
fuzz: new fuzzer for dirstate parser...

              r41051
            
      except Exception as e:

          pass

          # uncomment this print if you're editing this Python code

          # to debug failures.

          # print e

      )py",

        Augie Fackler
    
fuzz: add support for fuzzing under either Python 2 or 3...

              r44311
            
      	                                      "fuzzer", Py_file_input);

        Augie Fackler
    
fuzz: new fuzzer for dirstate parser...

              r41051
            
      	return 0;

      }

      int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)

      {

      	PyObject *text =

      	    PyBytes_FromStringAndSize((const char *)Data, (Py_ssize_t)Size);

      	PyObject *locals = PyDict_New();

      	PyDict_SetItemString(locals, "data", text);

      	PyObject *res = PyEval_EvalCode(code, contrib::pyglobals(), locals);

      	if (!res) {

      		PyErr_Print();

      	}

      	Py_XDECREF(res);

      	Py_DECREF(locals);

      	Py_DECREF(text);

      	return 0; // Non-zero return values are reserved for future use.

      }

      }

	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

Augie Fackler fuzz: new fuzzer for dirstate parser...	r41051	#include <Python.h>
		#include <assert.h>
		#include <stdlib.h>
		#include <unistd.h>

		#include <string>

		#include "pyutil.h"

		extern "C" {

Augie Fackler fuzz: add support for fuzzing under either Python 2 or 3...	r44311	static PYCODETYPE *code;
Augie Fackler fuzz: new fuzzer for dirstate parser...	r41051
		extern "C" int LLVMFuzzerInitialize(int argc, char **argv)
		{
		contrib::initpy(*argv[0]);
Augie Fackler fuzz: add support for fuzzing under either Python 2 or 3...	r44311	code = (PYCODETYPE *)Py_CompileString(R"py(
Augie Fackler fuzz: new fuzzer for dirstate parser...	r41051	try:
		dmap = {}
		copymap = {}
Augie Fackler fuzz: add support for fuzzing under either Python 2 or 3...	r44311	p = parsers.parse_dirstate(dmap, copymap, data)
Augie Fackler fuzz: new fuzzer for dirstate parser...	r41051	except Exception as e:
		pass
		# uncomment this print if you're editing this Python code
		# to debug failures.
		# print e
		)py",
Augie Fackler fuzz: add support for fuzzing under either Python 2 or 3...	r44311	"fuzzer", Py_file_input);
Augie Fackler fuzz: new fuzzer for dirstate parser...	r41051	return 0;
		}

		int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
		{
		PyObject *text =
		PyBytes_FromStringAndSize((const char *)Data, (Py_ssize_t)Size);
		PyObject *locals = PyDict_New();
		PyDict_SetItemString(locals, "data", text);
		PyObject *res = PyEval_EvalCode(code, contrib::pyglobals(), locals);
		if (!res) {
		PyErr_Print();
		}
		Py_XDECREF(res);
		Py_DECREF(locals);
		Py_DECREF(text);
		return 0; // Non-zero return values are reserved for future use.
		}
		}