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
Added odr_constructed_more check
[yaz-moved-to-github.git]
/
odr
/
ber_oid.c
diff --git
a/odr/ber_oid.c
b/odr/ber_oid.c
index
b2c6d11
..
dd4fd82
100644
(file)
--- a/
odr/ber_oid.c
+++ b/
odr/ber_oid.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_oid.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_oid.c,v $
- * Revision 1.2 1995-02-14 20:39:55 quinn
+ * Revision 1.4 1995-03-08 12:12:11 quinn
+ * Added better error checking.
+ *
+ * Revision 1.3 1995/03/01 08:40:56 quinn
+ * Smallish changes.
+ *
+ * Revision 1.2 1995/02/14 20:39:55 quinn
* Fixed bugs in completeBER and (serious one in) ber_oid.
*
* Revision 1.1 1995/02/03 17:04:36 quinn
* Fixed bugs in completeBER and (serious one in) ber_oid.
*
* Revision 1.1 1995/02/03 17:04:36 quinn
@@
-14,7
+20,7
@@
#include <odr.h>
#include <odr.h>
-int ber_oid(ODR o, Odr_oid *p)
+int ber_oidc(ODR o, Odr_oid *p)
{
int len;
unsigned char *lenp;
{
int len;
unsigned char *lenp;
@@
-25,9
+31,15
@@
int ber_oid(ODR o, Odr_oid *p)
{
case ODR_DECODE:
if ((res = ber_declen(o->bp, &len)) < 1)
{
case ODR_DECODE:
if ((res = ber_declen(o->bp, &len)) < 1)
+ {
+ o->error = OPROTO;
return 0;
return 0;
+ }
if (len < 0)
if (len < 0)
+ {
+ o->error = OPROTO;
return 0;
return 0;
+ }
o->bp += res;
o->left -= res;
if (len == 0)
o->bp += res;
o->left -= res;
if (len == 0)
@@
-49,7
+61,10
@@
int ber_oid(ODR o, Odr_oid *p)
do
{
if (!len)
do
{
if (!len)
+ {
+ o->error = OPROTO;
return 0;
return 0;
+ }
p[pos] <<= 7;
p[pos] |= *o->bp & 0X7F;
len--;
p[pos] <<= 7;
p[pos] |= *o->bp & 0X7F;
len--;
@@
-67,7
+82,10
@@
int ber_oid(ODR o, Odr_oid *p)
o->bp++;
o->left--;
if (p[0] < 0 && p[1] <= 0)
o->bp++;
o->left--;
if (p[0] < 0 && p[1] <= 0)
+ {
+ o->error = ODATA;
return 0;
return 0;
+ }
p[1] = p[0] * 40 + p[1];
for (pos = 1; p[pos] >= 0; pos++)
{
p[1] = p[0] * 40 + p[1];
for (pos = 1; p[pos] >= 0; pos++)
{
@@
-80,14
+98,20
@@
int ber_oid(ODR o, Odr_oid *p)
}
while (id);
if (n > o->left)
}
while (id);
if (n > o->left)
+ {
+ o->error = OSPACE;
return 0;
return 0;
+ }
o->left -= n;
while (n--)
*(o->bp++) = octs[n] | ((n > 0) << 7);
}
if (ber_enclen(lenp, (o->bp - lenp) - 1, 1, 1) != 1)
o->left -= n;
while (n--)
*(o->bp++) = octs[n] | ((n > 0) << 7);
}
if (ber_enclen(lenp, (o->bp - lenp) - 1, 1, 1) != 1)
+ {
+ o->error = OOTHER;
return 0;
return 0;
+ }
return 1;
return 1;
- default: return 0;
+ default: o->error = OOTHER; return 0;
}
}
}
}