Commit 2f0c4841 authored by Davi Arnaut's avatar Davi Arnaut

Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.

parents cfe8acb1 cd504e49
...@@ -84,8 +84,11 @@ static int safe_print_str(const char *addr, int max_len) ...@@ -84,8 +84,11 @@ static int safe_print_str(const char *addr, int max_len)
if ((fd= open(buf, O_RDONLY)) < 0) if ((fd= open(buf, O_RDONLY)) < 0)
return -1; return -1;
/* Ensure that off_t can hold a pointer. */
compile_time_assert(sizeof(off_t) >= sizeof(intptr));
total= max_len; total= max_len;
offset= (off_t) addr; offset= (intptr) addr;
/* Read up to the maximum number of bytes. */ /* Read up to the maximum number of bytes. */
while (total) while (total)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment