http-backend: Fix bad treatment of uintmax_t in Content-Length

Our Content-Length needs to report an off_t, which could be larger precision than size_t on this system (e.g. 32 bit binary built with 64 bit large file support). We also shouldn't be passing a size_t parameter to printf when we've used PRIuMAX as the format specifier. Fix both issues by using uintmax_t for the hdr_int() routine, allowing strbuf's size_t to automatically upcast, and off_t to always fit. Also fixed the copy loop we use inside of send_local_file(), we never actually updated the size variable so we might as well not use it. Reported-by: Tarmigan <tarmigan+git@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Shawn O. Pearce committed Nov 11, 2009 at 20:42 UTC 4a5328d644b67be7fae1ff360e142d5dee4e63e9

1 file changed +3 -6

http-backend.c

+3 -6

@@ -134,7 +134,7 @@ static void hdr_str(const char *name, const char *value)

134 format_write(1, "%s: %s\r\n", name, value);

135 }

136

137 -static void hdr_int(const char *name, size_t value)

137 +static void hdr_int(const char *name, uintmax_t value)

138 {

139 format_write(1, "%s: %" PRIuMAX "\r\n", name, value);

140 }

@@ -216,7 +216,6 @@ static void send_local_file(const char *the_type, const char *name)

216 char *buf = xmalloc(buf_alloc);

217 int fd;

218 struct stat sb;

219 - size_t size;

219

220 fd = open(p, O_RDONLY);

221 if (fd < 0)

@@ -224,14 +223,12 @@ static void send_local_file(const char *the_type, const char *name)

223 if (fstat(fd, &sb) < 0)

224 die_errno("Cannot stat '%s'", p);

225

227 - size = xsize_t(sb.st_size);

228 -

229 - hdr_int(content_length, size);

226 + hdr_int(content_length, sb.st_size);

227 hdr_str(content_type, the_type);

228 hdr_date(last_modified, sb.st_mtime);

229 end_headers();

230

234 - while (size) {

231 + for (;;) {

232 ssize_t n = xread(fd, buf, buf_alloc);

233 if (n < 0)

234 die_errno("Cannot read '%s'", p);