git/streaming.c, branch v2.13.2

Merge branch 'jk/pack-objects-optim-mru'

2016-10-10T21:03:47Z

"git pack-objects" in a repository with many packfiles used to spend a lot of time looking for/at objects in them; the accesses to the packfiles are now optimized by checking the most-recently-used packfile first. * jk/pack-objects-optim-mru: pack-objects: use mru list when iterating over packs pack-objects: break delta cycles before delta-search phase sha1_file: make packed_object_info public provide an initializer for "struct object_info"

Merge branch 'jc/verify-loose-object-header'

2016-10-03T20:30:36Z

Codepaths that read from an on-disk loose object were too loose in validating what they are reading is a proper object file and sometimes read past the data they read from the disk, which has been corrected. H/t to Gustavo Grieco for reporting. * jc/verify-loose-object-header: unpack_sha1_header(): detect malformed object header streaming: make sure to notice corrupt object

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

streaming: make stream_blob_to_fd take struct object_id

2016-09-07T19:59:42Z

Since all of its callers have been updated, modify stream_blob_to_fd to take a struct object_id. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

provide an initializer for "struct object_info"

2016-08-11T17:42:23Z

An all-zero initializer is fine for this struct, but because the first element is a pointer, call sites need to know to use "NULL" instead of "0". Otherwise some static checkers like "sparse" will complain; see d099b71 (Fix some sparse warnings, 2013-07-18) for example. So let's provide an initializer to make this easier to get right. But let's also comment that memset() to zero is explicitly OK[1]. One of the callers embeds object_info in another struct which is initialized via memset (expand_data in builtin/cat-file.c). Since our subset of C doesn't allow assignment from a compound literal, handling this in any other way is awkward, so we'd like to keep the ability to initialize by memset(). By documenting this property, it should make anybody who wants to change the initializer think twice before doing so. There's one other caller of interest. In parse_sha1_header(), we did not initialize the struct fully in the first place. This turned out not to be a bug because the sub-function it calls does not look at any other fields except the ones we did initialize. But that assumption might not hold in the future, so it's a dangerous construct. This patch switches it to initializing the whole struct, which protects us against unexpected reads of the other fields. [1] Obviously using memset() to initialize a pointer violates the C standard, but we long ago decided that it was an acceptable tradeoff in the real world. Signed-off-by: Jeff King 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