[PATCH v2 29/29] read_packed_refs(): die if `packed-refs` contains bogus data
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jun 23, 2017, 07:01 UTC
- Message-ID
- <1e08748aa5a6dc05003b08207a9a4bc344758ca2.1498200513.git.mhagger@alum.mit.edu>
- In-Reply-To
- <cover.1498200513.git.mhagger@alum.mit.edu>
The old code ignored any lines that it didn't understand. This is dangerous. Instead, `die()` if the `packed-refs` file contains any lines that we don't know how to handle.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- refs/packed-backend.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/refs/packed-backend.c b/refs/packed-backend.c index 377c775adb..1cbaf036df 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -253,9 +253,7 @@ static struct packed_ref_cache *read_packed_refs(const char *packed_refs_file) (peeled == PEELED_TAGS && starts_with(refname, "refs/tags/"))) last->flag |= REF_KNOWS_PEELED; add_ref_entry(dir, last); - continue; - } - if (last && + } else if (last && line.buf[0] == '^' && line.len == PEELED_LINE_LENGTH && line.buf[PEELED_LINE_LENGTH - 1] == '\n' && @@ -267,6 +265,8 @@ static struct packed_ref_cache *read_packed_refs(const char *packed_refs_file) * reference: */ last->flag |= REF_KNOWS_PEELED; + } else { + die("unexpected line in %s: %s", packed_refs_file, line.buf); } }
-- 2.11.0