git/streaming.c, branch v2.10.2

streaming: make sure to notice corrupt object

2016-09-26T17:48:03Z

The streaming read interface from a loose object called parse_sha1_header() but discarded its return value, without noticing a potential error. Signed-off-by: Junio C Hamano

Merge branch 'sb/plug-streaming-leak'

2015-04-14T18:49:09Z

* sb/plug-streaming-leak: streaming.c: fix a memleak

streaming.c: fix a memleak

2015-03-31T19:14:42Z

When stream_blob_to_fd() opens an input stream with a filter, the filter gets discarded upon calling close_istream() before the function returns in the normal case. However, when we fail to open the stream, we failed to discard the filter. By discarding the filter in the failure case, give a consistent life-time rule of the filter to the callers; otherwise the callers need to conditionally discard the filter themselves, and this function does not give enough hint for the caller to do so correctly. Signed-off-by: John Keeping Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

open_istream(): do not dereference NULL in the error case

2014-02-19T00:00:53Z

When stream-filter cannot be attached, it is expected to return NULL, and we should close the stream we opened and signal an error by returning NULL ourselves from this function. However, we attempted to dereference that NULL pointer between the point we detected the error and returned from the function. Brought-to-attention-by: John Keeping Signed-off-by: Junio C Hamano

Merge branch 'ef/mingw-write'

2014-01-27T18:44:59Z

* ef/mingw-write: mingw: remove mingw_write prefer xwrite instead of write

prefer xwrite instead of write

2014-01-17T20:09:26Z

Our xwrite wrapper already deals with a few potential hazards, and are as such more robust. Prefer it instead of write to get the robustness benefits everywhere. Signed-off-by: Erik Faye-Lund Reviewed-and-improved-by: Jonathan Nieder Signed-off-by: Junio C Hamano

sha1_object_info_extended(): add an "unsigned flags" parameter

2013-12-12T19:53:48Z

This parameter is not used yet, but it will be used to tell sha1_object_info_extended() if it should perform object replacement or not. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

Merge branch 'jk/cat-file-batch-optim'

2013-07-25T02:21:21Z

If somebody wants to only know on-disk footprint of an object without having to know its type or payload size, we can bypass a lot of code to cheaply learn it. * jk/cat-file-batch-optim: Fix some sparse warnings sha1_object_info_extended: pass object_info to helpers sha1_object_info_extended: make type calculation optional packed_object_info: make type lookup optional packed_object_info: hoist delta type resolution to helper sha1_loose_object_info: make type lookup optional sha1_object_info_extended: rename "status" to "type" cat-file: disable object/refname ambiguity check for batch mode

open_istream: remove unneeded check for null pointer

2013-07-23T18:35:18Z

'st' is allocated via xmalloc a few lines before and passed to the stream opening functions. The xmalloc function is written in a way that either 'st' is allocated valid memory or xmalloc already dies. The function calls to open_istream_* do not change 'st', as the pointer is passed by reference and not a pointer of a pointer. Hence 'st' cannot be null at that part of the code. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Fix some sparse warnings

2013-07-18T23:43:47Z

Sparse issues some "Using plain integer as NULL pointer" warnings. Each warning relates to the use of an '{0}' initialiser expression in the declaration of an 'struct object_info'. The first field of this structure has pointer type. Thus, in order to suppress these warnings, we replace the initialiser expression with '{NULL}'. Signed-off-by: Ramsay Jones Acked-by: Jeff King Signed-off-by: Junio C Hamano