Commit cb1aa8b0 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

printf: make sure %x are treated unsigned 

When using %x, the number must be treated as unsigned as otherwise it
would get sign-extended on for example 64bit machines and do wrong
output. This problem showed when doing printf("%08x", 0xffeeddcc) on a
64bit host.
parent d3d5c4a4

lib/mprintf.c

+8 −8
Original line number Diff line number Diff line
@@ -380,11 +380,11 @@ static long dprintf_Pass1(const char *format, va_stack_t *vto, char **endpos, 
        break;

      case 'x':

        vto[i].type = FORMAT_INT;

        flags |= FLAGS_HEX;

        flags |= FLAGS_HEX|FLAGS_UNSIGNED;

        break;

      case 'X':

        vto[i].type = FORMAT_INT;

        flags |= FLAGS_HEX|FLAGS_UPPER;

        flags |= FLAGS_HEX|FLAGS_UPPER|FLAGS_UNSIGNED;

        break;

      case 'c':

        vto[i].type = FORMAT_INT;
@@ -633,23 +633,23 @@ static int dprintf_formatf( 
            OUTCHAR(' ');

        break;

      }

      if(p->flags & FLAGS_UNSIGNED) {

        /* Decimal unsigned integer.  */

        base = 10;

        goto unsigned_number;

      }

      if(p->flags & FLAGS_OCTAL) {

        /* Octal unsigned integer.  */

        base = 8;

        goto unsigned_number;

      }

      if(p->flags & FLAGS_HEX) {

      else if(p->flags & FLAGS_HEX) {

        /* Hexadecimal unsigned integer.  */



        digits = (p->flags & FLAGS_UPPER)? upper_digits : lower_digits;

        base = 16;

        goto unsigned_number;

      }

      else if(p->flags & FLAGS_UNSIGNED) {

        /* Decimal unsigned integer.  */

        base = 10;

        goto unsigned_number;

      }



      /* Decimal integer.  */

      base = 10;