| f_string.c (59191) | f_string.c (68651) |
|---|---|
| 1/* crypto/asn1/f_string.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 144 unchanged lines hidden (view full) --- 153 { 154 ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_ODD_NUMBER_OF_CHARS); 155 goto err; 156 } 157 i/=2; 158 if (num+i > slen) 159 { 160 if (s == NULL) | 1/* crypto/asn1/f_string.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 144 unchanged lines hidden (view full) --- 153 { 154 ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_ODD_NUMBER_OF_CHARS); 155 goto err; 156 } 157 i/=2; 158 if (num+i > slen) 159 { 160 if (s == NULL) |
| 161 sp=(unsigned char *)Malloc( | 161 sp=(unsigned char *)OPENSSL_malloc( |
| 162 (unsigned int)num+i*2); 163 else | 162 (unsigned int)num+i*2); 163 else |
| 164 sp=(unsigned char *)Realloc(s, | 164 sp=(unsigned char *)OPENSSL_realloc(s, |
| 165 (unsigned int)num+i*2); 166 if (sp == NULL) 167 { 168 ASN1err(ASN1_F_A2I_ASN1_STRING,ERR_R_MALLOC_FAILURE); | 165 (unsigned int)num+i*2); 166 if (sp == NULL) 167 { 168 ASN1err(ASN1_F_A2I_ASN1_STRING,ERR_R_MALLOC_FAILURE); |
| 169 if (s != NULL) Free(s); | 169 if (s != NULL) OPENSSL_free(s); |
| 170 goto err; 171 } 172 s=sp; 173 slen=num+i*2; 174 } 175 for (j=0; j<i; j++,k+=2) 176 { 177 for (n=0; n<2; n++) --- 35 unchanged lines hidden --- | 170 goto err; 171 } 172 s=sp; 173 slen=num+i*2; 174 } 175 for (j=0; j<i; j++,k+=2) 176 { 177 for (n=0; n<2; n++) --- 35 unchanged lines hidden --- |