generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BIO_debug_callback: Fix output on 64-bit machines

Browse Source 
BIO_debug_callback() no longer assumes the hexadecimal representation of
a pointer fits in 8 characters.

Signed-off-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Godbee 2014-09-21 02:14:11 -04:00 committed by Richard Levitte
parent e1b568dd24
commit 460e920d8a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/bio/bio_cb.c
View File

@ -70,14 +70,17 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
char buf[256]; char buf[256];
char *p; char *p;
long r = 1; long r = 1;
int len;
size_t p_maxlen; size_t p_maxlen;
if (BIO_CB_RETURN & cmd) if (BIO_CB_RETURN & cmd)
r = ret; r = ret;
BIO_snprintf(buf, sizeof buf, "BIO[%08lX]:", (unsigned long)bio); len = BIO_snprintf(buf,sizeof buf,"BIO[%p]: ",(void *)bio);
p = &(buf[14]);
p_maxlen = sizeof buf - 14; p = buf + len;
p_maxlen = sizeof(buf) - len;
switch (cmd) { switch (cmd) {
case BIO_CB_FREE: case BIO_CB_FREE:
BIO_snprintf(p, p_maxlen, "Free - %s\n", bio->method->name); BIO_snprintf(p, p_maxlen, "Free - %s\n", bio->method->name);