Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:12:54 +0000 (13:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:12:55 +0000 (13:12 -0800)
Code clean-up.

* sb/hex-object-name-is-at-most-41-bytes-long:
hex.c: reduce memory footprint of sha1_to_hex static buffers

1  2 
hex.c
diff --combined hex.c
index 9ebc050637532765b775cbd8e3b92951a67ea333,9ec5a3b325822e411ac7aa4416d9ea2a53ef94e7..cfd9d722fd92f137a79ee2bf6be44b4b393c6da6
--- 1/hex.c
--- 2/hex.c
+++ b/hex.c
@@@ -39,15 -39,7 +39,15 @@@ int get_sha1_hex(const char *hex, unsig
  {
        int i;
        for (i = 0; i < 20; i++) {
 -              unsigned int val = (hexval(hex[0]) << 4) | hexval(hex[1]);
 +              unsigned int val;
 +              /*
 +               * hex[1]=='\0' is caught when val is checked below,
 +               * but if hex[0] is NUL we have to avoid reading
 +               * past the end of the string:
 +               */
 +              if (!hex[0])
 +                      return -1;
 +              val = (hexval(hex[0]) << 4) | hexval(hex[1]);
                if (val & ~0xff)
                        return -1;
                *sha1++ = val;
@@@ -59,7 -51,7 +59,7 @@@
  char *sha1_to_hex(const unsigned char *sha1)
  {
        static int bufno;
-       static char hexbuffer[4][50];
+       static char hexbuffer[4][41];
        static const char hex[] = "0123456789abcdef";
        char *buffer = hexbuffer[3 & ++bufno], *buf = buffer;
        int i;