oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

REVERT: add and use der_{malloc,free}

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22429 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-01-13 10:25:50 +00:00
parent f8574e2b52
commit 731d6e6df8
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/asn1/asn1-common.h
View File

@@ -50,14 +50,14 @@ typedef struct heim_octet_string heim_any_set;
#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R) \ #define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R) \
do { \ do { \
(BL) = length_##T((S)); \ (BL) = length_##T((S)); \
(B) = der_malloc((BL)); \ (B) = malloc((BL)); \
if((B) == NULL) { \ if((B) == NULL) { \
(R) = ENOMEM; \ (R) = ENOMEM; \
} else { \ } else { \
(R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \ (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
(S), (L)); \ (S), (L)); \
if((R) != 0) { \ if((R) != 0) { \
der_free((B)); \ free((B)); \
(B) = NULL; \ (B) = NULL; \
} \ } \
} \ } \

12
lib/asn1/der.c
View File

@@ -140,15 +140,3 @@ der_get_tag_num(const char *name)
{ {
return get_type(name, tag_names, SIZEOF_ARRAY(tag_names)); return get_type(name, tag_names, SIZEOF_ARRAY(tag_names));
} }
void
der_free(void *ptr)
{
free(ptr);
}
void *
der_malloc(size_t size)
{
return malloc(size);
}

4
lib/asn1/gen.c
View File

@@ -154,14 +154,14 @@ init_generate (const char *filename, const char *base)
fputs("#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R) \\\n" fputs("#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R) \\\n"
" do { \\\n" " do { \\\n"
" (BL) = length_##T((S)); \\\n" " (BL) = length_##T((S)); \\\n"
" (B) = der_malloc((BL)); \\\n" " (B) = malloc((BL)); \\\n"
" if((B) == NULL) { \\\n" " if((B) == NULL) { \\\n"
" (R) = ENOMEM; \\\n" " (R) = ENOMEM; \\\n"
" } else { \\\n" " } else { \\\n"
" (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \\\n" " (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \\\n"
" (S), (L)); \\\n" " (S), (L)); \\\n"
" if((R) != 0) { \\\n" " if((R) != 0) { \\\n"
" der_free((B)); \\\n" " free((B)); \\\n"
" (B) = NULL; \\\n" " (B) = NULL; \\\n"
" } \\\n" " } \\\n"
" } \\\n" " } \\\n"

2
lib/asn1/gen_encode.c
View File

@@ -316,7 +316,7 @@ encode_type (const char *name, const Type *t, const char *tmpstr)
"if(eret) {\n" "if(eret) {\n"
"i--;\n" "i--;\n"
"while (i >= 0) {\n" "while (i >= 0) {\n"
"der_free(val[i].data);\n" "free(val[i].data);\n"
"i--;\n" "i--;\n"
"}\n" "}\n"
"free(val);\n" "free(val);\n"