projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor changes.
[yaz-moved-to-github.git]
/
odr
/
odr_oct.c
diff --git
a/odr/odr_oct.c
b/odr/odr_oct.c
index
1140648
..
fe2ffc5
100644
(file)
--- a/
odr/odr_oct.c
+++ b/
odr/odr_oct.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oct.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oct.c,v $
- * Revision 1.6 1995-02-10 18:57:26 quinn
+ * Revision 1.8 1995-03-17 10:17:54 quinn
+ * Added memory management.
+ *
+ * Revision 1.7 1995/03/08 12:12:27 quinn
+ * Added better error checking.
+ *
+ * Revision 1.6 1995/02/10 18:57:26 quinn
* More in the way of error-checking.
*
* Revision 1.5 1995/02/09 15:51:49 quinn
* More in the way of error-checking.
*
* Revision 1.5 1995/02/09 15:51:49 quinn
@@
-34,12
+40,14
@@
int odr_octetstring(ODR o, Odr_oct **p, int opt)
{
int res, cons = 0;
{
int res, cons = 0;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
- if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons)) < 0)
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
return 0;
if (!res)
return opt;
return 0;
if (!res)
return opt;
@@
-50,14
+58,14
@@
int odr_octetstring(ODR o, Odr_oct **p, int opt)
}
if (o->direction == ODR_DECODE)
{
}
if (o->direction == ODR_DECODE)
{
- *p = nalloc(o, sizeof(Odr_oct));
+ *p = odr_malloc(o, sizeof(Odr_oct));
(*p)->size= 0;
(*p)->len = 0;
(*p)->buf = 0;
}
if (ber_octetstring(o, *p, cons))
return 1;
(*p)->size= 0;
(*p)->len = 0;
(*p)->buf = 0;
}
if (ber_octetstring(o, *p, cons))
return 1;
- *p = 0;
+ o->error = OOTHER;
return 0;
}
return 0;
}
@@
-69,12
+77,14
@@
int odr_cstring(ODR o, char **p, int opt)
int cons = 0, res;
Odr_oct *t;
int cons = 0, res;
Odr_oct *t;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
- if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons)) < 0)
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
return 0;
if (!res)
return opt;
return 0;
if (!res)
return opt;
@@
-83,7
+93,7
@@
int odr_cstring(ODR o, char **p, int opt)
fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
return 1;
}
fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
return 1;
}
- t = nalloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
+ t = odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
if (o->direction == ODR_ENCODE)
{
t->buf = (unsigned char *) *p;
if (o->direction == ODR_ENCODE)
{
t->buf = (unsigned char *) *p;