| @@ -146,27 +146,27 @@ int BUF_MEM_grow_clean(BUF_MEM *str, siz | | | @@ -146,27 +146,27 @@ int BUF_MEM_grow_clean(BUF_MEM *str, siz |
| 146 | memset(&str->data[len],0,str->length-len); | | 146 | memset(&str->data[len],0,str->length-len); |
| 147 | str->length=len; | | 147 | str->length=len; |
| 148 | return(len); | | 148 | return(len); |
| 149 | } | | 149 | } |
| 150 | if (str->max >= len) | | 150 | if (str->max >= len) |
| 151 | { | | 151 | { |
| 152 | memset(&str->data[str->length],0,len-str->length); | | 152 | memset(&str->data[str->length],0,len-str->length); |
| 153 | str->length=len; | | 153 | str->length=len; |
| 154 | return(len); | | 154 | return(len); |
| 155 | } | | 155 | } |
| 156 | /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */ | | 156 | /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */ |
| 157 | if (len > LIMIT_BEFORE_EXPANSION) | | 157 | if (len > LIMIT_BEFORE_EXPANSION) |
| 158 | { | | 158 | { |
| 159 | BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE); | | 159 | BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE); |
| 160 | return 0; | | 160 | return 0; |
| 161 | } | | 161 | } |
| 162 | n=(len+3)/3*4; | | 162 | n=(len+3)/3*4; |
| 163 | if (str->data == NULL) | | 163 | if (str->data == NULL) |
| 164 | ret=OPENSSL_malloc(n); | | 164 | ret=OPENSSL_malloc(n); |
| 165 | else | | 165 | else |
| 166 | ret=OPENSSL_realloc_clean(str->data,str->max,n); | | 166 | ret=OPENSSL_realloc_clean(str->data,str->max,n); |
| 167 | if (ret == NULL) | | 167 | if (ret == NULL) |
| 168 | { | | 168 | { |
| 169 | BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE); | | 169 | BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE); |
| 170 | len=0; | | 170 | len=0; |
| 171 | } | | 171 | } |
| 172 | else | | 172 | else |