f_enum.c (59191) | f_enum.c (68651) |
---|---|
1/* crypto/asn1/f_enum.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 * --- 139 unchanged lines hidden (view full) --- 148 { 149 ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ASN1_R_ODD_NUMBER_OF_CHARS); 150 goto err; 151 } 152 i/=2; 153 if (num+i > slen) 154 { 155 if (s == NULL) | 1/* crypto/asn1/f_enum.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 * --- 139 unchanged lines hidden (view full) --- 148 { 149 ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ASN1_R_ODD_NUMBER_OF_CHARS); 150 goto err; 151 } 152 i/=2; 153 if (num+i > slen) 154 { 155 if (s == NULL) |
156 sp=(unsigned char *)Malloc( | 156 sp=(unsigned char *)OPENSSL_malloc( |
157 (unsigned int)num+i*2); 158 else | 157 (unsigned int)num+i*2); 158 else |
159 sp=(unsigned char *)Realloc(s, | 159 sp=(unsigned char *)OPENSSL_realloc(s, |
160 (unsigned int)num+i*2); 161 if (sp == NULL) 162 { 163 ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE); | 160 (unsigned int)num+i*2); 161 if (sp == NULL) 162 { 163 ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE); |
164 if (s != NULL) Free(s); | 164 if (s != NULL) OPENSSL_free(s); |
165 goto err; 166 } 167 s=sp; 168 slen=num+i*2; 169 } 170 for (j=0; j<i; j++,k+=2) 171 { 172 for (n=0; n<2; n++) --- 35 unchanged lines hidden --- | 165 goto err; 166 } 167 s=sp; 168 slen=num+i*2; 169 } 170 for (j=0; j<i; j++,k+=2) 171 { 172 for (n=0; n<2; n++) --- 35 unchanged lines hidden --- |