freshlybakedca.ke / git
Git fork
fork atom

http: offer to cast `size_t` to `curl_off_t` safely

This commit moves the `xcurl_off_t()` function, which validates that a
given value fits within the `curl_off_t` data type and then casts it, to
a more central place so that it can be used outside of `remote-curl.c`,
too.

At the same time, this function is renamed to conform better with the
naming convention of the helper functions that safely cast from one data
type to another which has been well established in `git-compat-util.h`.

With this move, `gettext.h` must be `#include`d in `http.h` to allow the
error message to remain translatable.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Johannes Schindelin and committed by
Junio C Hamano e4efcd70 f368df43

+13 -11
unified split
+10
http.h
··· 8 #include <curl/curl.h> 9 #include <curl/easy.h> 10 11 #include "strbuf.h" 12 #include "remote.h" 13 ··· 94 } 95 96 #define missing_target(a) missing__target((a)->http_code, (a)->curl_result) 97 98 /* 99 * Normalize curl results to handle CURL_FAILONERROR (or lack thereof). Failing
··· 8 #include <curl/curl.h> 9 #include <curl/easy.h> 10 11 + #include "gettext.h" 12 #include "strbuf.h" 13 #include "remote.h" 14 ··· 95 } 96 97 #define missing_target(a) missing__target((a)->http_code, (a)->curl_result) 98 + 99 + static inline curl_off_t cast_size_t_to_curl_off_t(size_t a) 100 + { 101 + uintmax_t size = a; 102 + if (size > maximum_signed_value_of_type(curl_off_t)) 103 + die(_("number too large to represent as curl_off_t " 104 + "on this platform: %"PRIuMAX), (uintmax_t)a); 105 + return (curl_off_t)a; 106 + } 107 108 /* 109 * Normalize curl results to handle CURL_FAILONERROR (or lack thereof). Failing
+3 -11
remote-curl.c
··· 894 return err; 895 } 896 897 - static curl_off_t xcurl_off_t(size_t len) 898 - { 899 - uintmax_t size = len; 900 - if (size > maximum_signed_value_of_type(curl_off_t)) 901 - die(_("cannot handle pushes this big")); 902 - return (curl_off_t)size; 903 - } 904 - 905 /* 906 * If flush_received is true, do not attempt to read any more; just use what's 907 * in rpc->buf. ··· 999 * and we just need to send it. 1000 */ 1001 curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, gzip_body); 1002 - curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE_LARGE, xcurl_off_t(gzip_size)); 1003 1004 } else if (use_gzip && 1024 < rpc->len) { 1005 /* The client backend isn't giving us compressed data so ··· 1030 1031 headers = curl_slist_append(headers, "Content-Encoding: gzip"); 1032 curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, gzip_body); 1033 - curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE_LARGE, xcurl_off_t(gzip_size)); 1034 1035 if (options.verbosity > 1) { 1036 fprintf(stderr, "POST %s (gzip %lu to %lu bytes)\n", ··· 1043 * more normal Content-Length approach. 1044 */ 1045 curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, rpc->buf); 1046 - curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE_LARGE, xcurl_off_t(rpc->len)); 1047 if (options.verbosity > 1) { 1048 fprintf(stderr, "POST %s (%lu bytes)\n", 1049 rpc->service_name, (unsigned long)rpc->len);
··· 894 return err; 895 } 896 897 /* 898 * If flush_received is true, do not attempt to read any more; just use what's 899 * in rpc->buf. ··· 991 * and we just need to send it. 992 */ 993 curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, gzip_body); 994 + curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE_LARGE, cast_size_t_to_curl_off_t(gzip_size)); 995 996 } else if (use_gzip && 1024 < rpc->len) { 997 /* The client backend isn't giving us compressed data so ··· 1022 1023 headers = curl_slist_append(headers, "Content-Encoding: gzip"); 1024 curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, gzip_body); 1025 + curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE_LARGE, cast_size_t_to_curl_off_t(gzip_size)); 1026 1027 if (options.verbosity > 1) { 1028 fprintf(stderr, "POST %s (gzip %lu to %lu bytes)\n", ··· 1035 * more normal Content-Length approach. 1036 */ 1037 curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, rpc->buf); 1038 + curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE_LARGE, cast_size_t_to_curl_off_t(rpc->len)); 1039 if (options.verbosity > 1) { 1040 fprintf(stderr, "POST %s (%lu bytes)\n", 1041 rpc->service_name, (unsigned long)rpc->len);