diff options
| author | svoj@june.mysql.com <> | 2008-01-24 19:02:28 +0400 |
|---|---|---|
| committer | svoj@june.mysql.com <> | 2008-01-24 19:02:28 +0400 |
| commit | 673a8892ae1043a7e64c477a0322d408ea084239 (patch) | |
| tree | c70b87ff2b63b9bf93cf648e7cb84c4b40c015cf /mysys | |
| parent | e7b93517f754e364da7ac73143fe72b7b59e2247 (diff) | |
| parent | f249ea7e4f538ae1d84c9105d58c6398eae9a619 (diff) | |
| download | mariadb-git-673a8892ae1043a7e64c477a0322d408ea084239.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG28884/mysql-5.1-engines
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/base64.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysys/base64.c b/mysys/base64.c index dbe8927290d..6157dcaa5af 100644 --- a/mysys/base64.c +++ b/mysys/base64.c @@ -256,6 +256,7 @@ main(void) char * str; char * dst; + require(src); for (j= 0; j<src_len; j++) { char c= rand(); @@ -265,6 +266,7 @@ main(void) /* Encode */ needed_length= base64_needed_encoded_length(src_len); str= (char *) malloc(needed_length); + require(str); for (k= 0; k < needed_length; k++) str[k]= 0xff; /* Fill memory to check correct NUL termination */ require(base64_encode(src, src_len, str) == 0); @@ -272,7 +274,8 @@ main(void) /* Decode */ dst= (char *) malloc(base64_needed_decoded_length(strlen(str))); - dst_len= base64_decode(str, strlen(str), dst); + require(dst); + dst_len= base64_decode(str, strlen(str), dst, NULL); require(dst_len == src_len); if (memcmp(src, dst, src_len) != 0) |