fetch-object-info: detect truncated server responses
The loop reading the object-info response stops as soon as the reader returns something other than PACKET_READ_NORMAL. A server that somehow answers with fewer objects leaves the end of the result arrays empty. The caller trusts that every requested object will be filled in. die() if the loop doesn't reach the number of oids expected. Mentored-by: Karthik Nayak <karthik.188@gmail.com> Mentored-by: Chandra Pratap <chandrapratap3519@gmail.com> Signed-off-by: Pablo Sabater <pabloosabaterr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pablo Sabater committed
Aug 3, 2026 at 16:39 UTC
4a43c3e9f35a74cab50e88d77d1704d523598136
1 file changed
+8
-2
fetch-object-info.c
+8
-2
index ba7e179c44..cdb7f936f9 100644
--- a/fetch-object-info.c
+++ b/fetch-object-info.c
@@ -49,6 +49,7 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
struct packet_reader *reader, struct object_info *object_info_data,
const int stateless_rpc, const int fd_out)
{
+ size_t i;
int size_index = -1;
switch (version) {
@@ -82,7 +83,7 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
BUG("unknown protocol version");
}
- for (size_t i = 0; i < args->object_info_options->nr; i++) {
+ for (i = 0; i < args->object_info_options->nr; i++) {
if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
check_stateless_delimiter(stateless_rpc, reader,
"stateless delimiter expected");
@@ -106,7 +107,7 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
}
}
- for (size_t i = 0;
+ for (i = 0;
packet_reader_read(reader) == PACKET_READ_NORMAL &&
i < args->oids->nr;
i++) {
@@ -150,6 +151,11 @@ int fetch_object_info(const enum protocol_version version, struct object_info_ar
string_list_clear(&object_info_values, 0);
}
+
+ if (i != args->oids->nr)
+ die(_("object-info: expected %" PRIuMAX " objects, got %" PRIuMAX),
+ (uintmax_t)args->oids->nr, (uintmax_t)i);
+
check_stateless_delimiter(stateless_rpc, reader, "stateless delimiter expected");
return 0;