Revision b4eafbcdb84fc406bff37f06fdf6310aca7d0249 authored by Junio C Hamano on 21 November 2018, 13:57:44 UTC, committed by Junio C Hamano on 21 November 2018, 13:57:44 UTC
A corner case bugfix in "git rerere" code.

* en/rerere-multi-stage-1-fix:
  rerere: avoid buffer overrun
  t4200: demonstrate rerere segfault on specially crafted merge
2 parent s e1372c3 + ad2bf0d
Raw File
blob.c
#include "cache.h"
#include "blob.h"
#include "repository.h"
#include "alloc.h"

const char *blob_type = "blob";

struct blob *lookup_blob(struct repository *r, const struct object_id *oid)
{
	struct object *obj = lookup_object(r, oid->hash);
	if (!obj)
		return create_object(r, oid->hash,
				     alloc_blob_node(r));
	return object_as_type(r, obj, OBJ_BLOB, 0);
}

int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
{
	item->object.parsed = 1;
	return 0;
}
back to top