upstream/mercurial-mirror Files · contrib/fuzz/bdiff.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

Augie Fackler - - Load All Authors

File last commit:

r38191:fa0ddd5e default


                r39017:d49e490a

@94 stable

Download file

             bdiff.cc
        
                    44 lines
            
             | 1.0 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / contrib / fuzz / bdiff.cc
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       * bdiff.cc - fuzzer harness for bdiff.c

       *

       * Copyright 2018, Google Inc.

       *

       * This software may be used and distributed according to the terms of

       * the GNU General Public License, incorporated herein by reference.

       */

      #include <memory>

      #include <stdlib.h>

      #include "fuzzutil.h"

      extern "C" {

      #include "bdiff.h"

      int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)

      {

      	auto maybe_inputs = SplitInputs(Data, Size);

      	if (!maybe_inputs) {

      		return 0;

      	}

      	auto inputs = std::move(maybe_inputs.value());

      	struct bdiff_line *a, *b;

      	int an = bdiff_splitlines(inputs.left.get(), inputs.left_size, &a);

      	int bn = bdiff_splitlines(inputs.right.get(), inputs.right_size, &b);

      	struct bdiff_hunk l;

      	bdiff_diff(a, an, b, bn, &l);

      	free(a);

      	free(b);

      	bdiff_freehunks(l.next);

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

      }

      #ifdef HG_FUZZER_INCLUDE_MAIN

      int main(int argc, char **argv)

      {

      	const char data[] = "asdf";

      	return LLVMFuzzerTestOneInput((const uint8_t *)data, 4);

      }

      #endif

      } // extern "C"

	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

				/*
				* bdiff.cc - fuzzer harness for bdiff.c
				*
				* Copyright 2018, Google Inc.
				*
				* This software may be used and distributed according to the terms of
				* the GNU General Public License, incorporated herein by reference.
				*/
				#include <memory>
				#include <stdlib.h>

				#include "fuzzutil.h"

				extern "C" {
				#include "bdiff.h"

				int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
				{
				auto maybe_inputs = SplitInputs(Data, Size);
				if (!maybe_inputs) {
				return 0;
				}
				auto inputs = std::move(maybe_inputs.value());

				struct bdiff_line a, b;
				int an = bdiff_splitlines(inputs.left.get(), inputs.left_size, &a);
				int bn = bdiff_splitlines(inputs.right.get(), inputs.right_size, &b);
				struct bdiff_hunk l;
				bdiff_diff(a, an, b, bn, &l);
				free(a);
				free(b);
				bdiff_freehunks(l.next);
				return 0; // Non-zero return values are reserved for future use.
				}

				#ifdef HG_FUZZER_INCLUDE_MAIN
				int main(int argc, char **argv)
				{
				const char data[] = "asdf";
				return LLVMFuzzerTestOneInput((const uint8_t *)data, 4);
				}
				#endif

				} // extern "C"