summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorSujatha Sivakumar <sujatha.sivakumar@oracle.com>2012-07-10 14:37:35 +0530
committerSujatha Sivakumar <sujatha.sivakumar@oracle.com>2012-07-10 14:37:35 +0530
commit2e84cf867498479a2d7ff8144eefd561abd027bd (patch)
treeafa3cece38781f7a02d767695e524a0b1229c945 /mysys
parent8941847704f6f679a8557cee2d386fe25d01868b (diff)
parent13f7f002886c18fc911f6cf6d5bd672f8c96d844 (diff)
downloadmariadb-git-2e84cf867498479a2d7ff8144eefd561abd027bd.tar.gz
merge from 5.1 to 5.5
Diffstat (limited to 'mysys')
-rw-r--r--mysys/mf_iocache2.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c
index d0918fb5706..6339532fa16 100644
--- a/mysys/mf_iocache2.c
+++ b/mysys/mf_iocache2.c
@@ -433,7 +433,11 @@ process_flags:
memset(buffz, '0', minimum_width - length2);
else
memset(buffz, ' ', minimum_width - length2);
- my_b_write(info, buffz, minimum_width - length2);
+ if (my_b_write(info, buffz, minimum_width - length2))
+ {
+ my_afree(buffz);
+ goto err;
+ }
my_afree(buffz);
}