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

copy_* functions now returns an int (0 or ENOMEM).

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2458 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-07-19 02:07:19 +00:00
parent e520087f91
commit 58dbc27fe5
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/asn1/der.h
View File

@@ -118,8 +118,8 @@ size_t length_general_string (general_string *data);
size_t length_octet_string (octet_string *k); size_t length_octet_string (octet_string *k);
size_t length_generalized_time (time_t *t); size_t length_generalized_time (time_t *t);
void copy_general_string (const general_string *from, general_string *to); int copy_general_string (const general_string *from, general_string *to);
void copy_octet_string (const octet_string *from, octet_string *to); int copy_octet_string (const octet_string *from, octet_string *to);
int fix_dce(size_t reallen, size_t *len); int fix_dce(size_t reallen, size_t *len);

18
lib/asn1/gen_copy.c
View File

@@ -43,7 +43,8 @@ RCSID("$Id$");
static void static void
copy_primitive (char *typename, char *from, char *to) copy_primitive (char *typename, char *from, char *to)
{ {
fprintf (codefile, "copy_%s(%s, %s);\n", typename, from, to); fprintf (codefile, "if(copy_%s(%s, %s)) return ENOMEM;\n",
typename, from, to);
} }
static void static void
@@ -54,7 +55,8 @@ copy_type (char *from, char *to, Type *t)
#if 0 #if 0
copy_type (from, to, t->symbol->type); copy_type (from, to, t->symbol->type);
#endif #endif
fprintf (codefile, "copy_%s(%s, %s);\n", t->symbol->gen_name, from, to); fprintf (codefile, "if(copy_%s(%s, %s)) return ENOMEM;\n",
t->symbol->gen_name, from, to);
break; break;
case TInteger: case TInteger:
fprintf(codefile, "*(%s) = *(%s);\n", to, from); fprintf(codefile, "*(%s) = *(%s);\n", to, from);
@@ -84,6 +86,7 @@ copy_type (char *from, char *to, Type *t)
if(m->optional){ if(m->optional){
fprintf(codefile, "if(%s) {\n", f); fprintf(codefile, "if(%s) {\n", f);
fprintf(codefile, "%s = malloc(sizeof(*%s));\n", t, t); fprintf(codefile, "%s = malloc(sizeof(*%s));\n", t, t);
fprintf(codefile, "if(%s == NULL) return ENOMEM;\n", t);
} }
copy_type (f, t, m->type); copy_type (f, t, m->type);
if(m->optional){ if(m->optional){
@@ -101,9 +104,10 @@ copy_type (char *from, char *to, Type *t)
char *f; char *f;
char *T; char *T;
fprintf (codefile, "(%s)->val = " fprintf (codefile, "if(((%s)->val = "
"malloc((%s)->len * sizeof(*(%s)->val));\n", "malloc((%s)->len * sizeof(*(%s)->val))) == NULL)\n",
to, from, to); to, from, to);
fprintf (codefile, "return ENOMEM;\n");
fprintf(codefile, fprintf(codefile,
"for((%s)->len = 0; (%s)->len < (%s)->len; (%s)->len++){\n", "for((%s)->len = 0; (%s)->len < (%s)->len; (%s)->len++){\n",
to, to, from, to); to, to, from, to);
@@ -133,15 +137,15 @@ void
generate_type_copy (Symbol *s) generate_type_copy (Symbol *s)
{ {
fprintf (headerfile, fprintf (headerfile,
"void copy_%s(const %s *, %s *);\n", "int copy_%s(const %s *, %s *);\n",
s->gen_name, s->gen_name, s->gen_name); s->gen_name, s->gen_name, s->gen_name);
fprintf (codefile, "void\n" fprintf (codefile, "int\n"
"copy_%s(const %s *from, %s *to)\n" "copy_%s(const %s *from, %s *to)\n"
"{\n", "{\n",
s->gen_name, s->gen_name, s->gen_name); s->gen_name, s->gen_name, s->gen_name);
copy_type ("from", "to", s->type); copy_type ("from", "to", s->type);
fprintf (codefile, "}\n\n"); fprintf (codefile, "return 0;\n}\n\n");
} }