Commit 230c691a authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix fmtstr for BIO_printf() et al 



-   If we have a maximum amount of characters permitted to be printed
    (for example "%.2s", which allows for a maximum of 2 chars), we
    minimize the number of characters from the string to printed to
    that size.
-   If there is space for padding and there is a maximum amount of
    characters to print (for example "%3.2s", which shall give at
    least a 1 space padding), the amount of characters to pad with
    gets added to the maximum so the minimum field size (3 in this
    example) gets filled out.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent ac1a998d

crypto/bio/b_print.c

+8 −7
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <stdio.h>

#include <string.h>

#include <ctype.h>

#include <limits.h>

#include "internal/numbers.h"

#include "internal/cryptlib.h"

#ifndef NO_SYS_TYPES_H

# include <sys/types.h>
@@ -385,28 +385,29 @@ fmtstr(char **sbuffer, 
    if (value == 0)

        value = "<NULL>";



    strln = strlen(value);

    if (strln > INT_MAX)

        strln = INT_MAX;

    strln = OPENSSL_strnlen(value, max < 0 ? SIZE_MAX : (size_t)max);



    padlen = min - strln;

    if (min < 0 || padlen < 0)

        padlen = 0;

    if (max >= 0)

        max += padlen;      /* The maximum output including padding */

    if (flags & DP_F_MINUS)

        padlen = -padlen;



    while ((padlen > 0) && (cnt < max)) {

    while ((padlen > 0) && (max < 0 || cnt < max)) {

        if(!doapr_outch(sbuffer, buffer, currlen, maxlen, ' '))

            return 0;

        --padlen;

        ++cnt;

    }

    while (*value && (cnt < max)) {

    while (strln > 0 && (max < 0 || cnt < max)) {

        if(!doapr_outch(sbuffer, buffer, currlen, maxlen, *value++))

            return 0;

        --strln;

        ++cnt;

    }

    while ((padlen < 0) && (cnt < max)) {

    while ((padlen < 0) && (max < 0 || cnt < max)) {

        if(!doapr_outch(sbuffer, buffer, currlen, maxlen, ' '))

            return 0;

        ++padlen;