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

merge: do the trivial resolution after updating sparse checkout...

merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984

Yuya Nishihara - - Load All Authors

File last commit:

r38234:a1c0873a default


                r38780:d49e490a

@94 stable

Download file

             fuzzutil.cc
        
                    27 lines
            
             | 922 B
            
                | text/x-c
            
             |
                CppLexer
            
             / contrib / fuzz / fuzzutil.cc
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #include "fuzzutil.h"

      #include <cstring>

      #include <utility>

      contrib::optional<two_inputs> SplitInputs(const uint8_t *Data, size_t Size)

      {

      	if (!Size) {

      		return contrib::nullopt;

      	}

      	// figure out a random point in [0, Size] to split our input.

      	size_t left_size = (Data[0] / 255.0) * (Size - 1);

      	// Copy inputs to new allocations so if bdiff over-reads

      	// AddressSanitizer can detect it.

      	std::unique_ptr<char[]> left(new char[left_size]);

      	std::memcpy(left.get(), Data + 1, left_size);

      	// right starts at the next byte after left ends

      	size_t right_size = Size - (left_size + 1);

      	std::unique_ptr<char[]> right(new char[right_size]);

      	std::memcpy(right.get(), Data + 1 + left_size, right_size);

      	LOG(2) << "inputs are  " << left_size << " and " << right_size

      	       << " bytes" << std::endl;

      	two_inputs result = {std::move(right), right_size, std::move(left),

      	                     left_size};

      	return result;

      }

	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 "fuzzutil.h"

				#include <cstring>
				#include <utility>

				contrib::optional<two_inputs> SplitInputs(const uint8_t *Data, size_t Size)
				{
				if (!Size) {
				return contrib::nullopt;
				}
				// figure out a random point in [0, Size] to split our input.
				size_t left_size = (Data[0] / 255.0) * (Size - 1);

				// Copy inputs to new allocations so if bdiff over-reads
				// AddressSanitizer can detect it.
				std::unique_ptr<char[]> left(new char[left_size]);
				std::memcpy(left.get(), Data + 1, left_size);
				// right starts at the next byte after left ends
				size_t right_size = Size - (left_size + 1);
				std::unique_ptr<char[]> right(new char[right_size]);
				std::memcpy(right.get(), Data + 1 + left_size, right_size);
				LOG(2) << "inputs are " << left_size << " and " << right_size
				<< " bytes" << std::endl;
				two_inputs result = {std::move(right), right_size, std::move(left),
				left_size};
				return result;
				}