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

copies: handle a case when both merging csets are not descendant of merge base...

copies: handle a case when both merging csets are not descendant of merge base This patch fix the behaviour of fullcopytracing algorithm in the case when both the merging csets are not the descendant of merge base. Although it seems to be the rare case when both the csets are not descendant of merge base. But it can be seen in most of cases of content-divergence in evolve extension, where merge base is the common predecessor. Previous patch added a test where this algorithm can fail to continue because of an assumption that only one of the two csets can be dirty. This patch fix that error. For refrence I suggest you to look into the previous discussion held on a patch sent by Pulkit: https://phab.mercurial-scm.org/D3896 Differential Revision: https://phab.mercurial-scm.org/D5963

Augie Fackler - - Load All Authors

File last commit:

r38191:fa0ddd5e default


                r42098:7694b685

default

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"