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
Better ODR diagnostics for missing elements which includes additional
[yaz-moved-to-github.git]
/
odr
/
ber_null.c
diff --git
a/odr/ber_null.c
b/odr/ber_null.c
index
a883a81
..
3b84a1d
100644
(file)
--- a/
odr/ber_null.c
+++ b/
odr/ber_null.c
@@
-3,7
+3,7
@@
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: ber_null.c,v 1.13 2003-01-06 08:20:27 adam Exp $
+ * $Id: ber_null.c,v 1.14 2003-03-11 11:03:31 adam Exp $
*/
#if HAVE_CONFIG_H
#include <config.h>
*/
#if HAVE_CONFIG_H
#include <config.h>
@@
-26,9
+26,14
@@
int ber_null(ODR o)
#endif
return 1;
case ODR_DECODE:
#endif
return 1;
case ODR_DECODE:
+ if (odr_max(o) < 1)
+ {
+ odr_seterror(o, OPROTO, 39);
+ return 0;
+ }
if (*(o->bp++) != 0X00)
{
if (*(o->bp++) != 0X00)
{
- o->error = OPROTO;
+ odr_seterror(o, OPROTO, 12);
return 0;
}
#ifdef ODR_DEBUG
return 0;
}
#ifdef ODR_DEBUG
@@
-36,6
+41,6
@@
int ber_null(ODR o)
#endif
return 1;
case ODR_PRINT: return 1;
#endif
return 1;
case ODR_PRINT: return 1;
- default: o->error = OOTHER; return 0;
+ default: odr_seterror(o, OOTHER, 13); return 0;
}
}
}
}