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

split: close transaction in the unlikely event of a conflict while rebasing...

split: close transaction in the unlikely event of a conflict while rebasing `hg split` *should* never result in conflicts, but in case there are bugs, we should at least commit the transaction so they can continue the rebase. One of our users ran into the regression fixed by D10120. They fixed the conflict and the tried to continue the rebase, but it failed with "abort: cannot continue inconsistent rebase" because the rebase state referred to commits written in a transaction that was never committed. Side note: `hg split` should probably turn off copy tracing to reduce the impact of such bugs, and to speed it up as well. Copies made in the rebased commits should still be respected because `hg rebase` calls `copies.graftcopies()`. Differential Revision: https://phab.mercurial-scm.org/D10164

Augie Fackler - - Load All Authors

File last commit:

r44255:7857bd9b default


                r47492:7f6c002d

default

Download file

             bdiff.cc
        
                    39 lines
            
             | 969 B
            
                | 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 "FuzzedDataProvider.h"

      extern "C" {

      #include "bdiff.h"

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

      {

      	return 0;

      }

      int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)

      {

      	FuzzedDataProvider provider(Data, Size);

      	std::string left = provider.ConsumeRandomLengthString(Size);

      	std::string right = provider.ConsumeRemainingBytesAsString();

      	struct bdiff_line *a, *b;

      	int an = bdiff_splitlines(left.c_str(), left.size(), &a);

      	int bn = bdiff_splitlines(right.c_str(), 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.

      }

      } // 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 "FuzzedDataProvider.h"

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

				extern "C" int LLVMFuzzerInitialize(int argc, char **argv)
				{
				return 0;
				}

				int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
				{
				FuzzedDataProvider provider(Data, Size);
				std::string left = provider.ConsumeRandomLengthString(Size);
				std::string right = provider.ConsumeRemainingBytesAsString();

				struct bdiff_line a, b;
				int an = bdiff_splitlines(left.c_str(), left.size(), &a);
				int bn = bdiff_splitlines(right.c_str(), 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.
				}

				} // extern "C"