diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-03-22 16:13:15 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-03-27 09:10:34 +0200 |
| commit | 817ab8a8d428fe4854625ee0a804701449951833 (patch) | |
| tree | e84d2c51f1b3986a69ca04e9c00a779b7c0fcf57 /src/libstrongswan/utils.c | |
| parent | adfd3b992fc4effb81f8ce9268d66117e8c32557 (diff) | |
| download | strongswan-817ab8a8d428fe4854625ee0a804701449951833.tar.bz2 strongswan-817ab8a8d428fe4854625ee0a804701449951833.tar.xz | |
Don't cast second argument of mem_printf_hook (%b) to size_t.
Also treat the given number as unsigned int.
Due to the printf hook registration the second argument of
mem_printf_hook (if called via printf etc.) is always of type int*.
Casting this to a size_t pointer and then dereferencing that as int does
not work on big endian machines if int is smaller than size_t (e.g. on ppc64).
In order to make this change work if the argument is of a type larger
than int, size_t for instance, the second argument for %b has to be casted
to (u_)int.
Diffstat (limited to 'src/libstrongswan/utils.c')
| -rw-r--r-- | src/libstrongswan/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c index 5a104de7f..f76245a19 100644 --- a/src/libstrongswan/utils.c +++ b/src/libstrongswan/utils.c @@ -444,7 +444,7 @@ int mem_printf_hook(char *dst, size_t dstlen, printf_hook_spec_t *spec, const void *const *args) { char *bytes = *((void**)(args[0])); - int len = *((size_t*)(args[1])); + u_int len = *((int*)(args[1])); char buffer[BYTES_PER_LINE * 3]; char ascii_buffer[BYTES_PER_LINE + 1]; @@ -455,7 +455,7 @@ int mem_printf_hook(char *dst, size_t dstlen, int i = 0; int written = 0; - written += print_in_hook(dst, dstlen, "=> %d bytes @ %p", len, bytes); + written += print_in_hook(dst, dstlen, "=> %u bytes @ %p", len, bytes); while (bytes_pos < bytes_roof) { |