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 memory management.
[yaz-moved-to-github.git]
/
odr
/
ber_int.c
diff --git
a/odr/ber_int.c
b/odr/ber_int.c
index
b262781
..
e8e50cf
100644
(file)
--- a/
odr/ber_int.c
+++ b/
odr/ber_int.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_int.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_int.c,v $
- * Revision 1.2 1995-02-07 17:52:58 quinn
+ * Revision 1.4 1995-03-08 12:12:07 quinn
+ * Added better error checking.
+ *
+ * Revision 1.3 1995/02/09 15:51:46 quinn
+ * Works better now.
+ *
+ * Revision 1.2 1995/02/07 17:52:58 quinn
* A damn mess, but now things work, I think.
*
* Revision 1.1 1995/02/02 16:21:52 quinn
* A damn mess, but now things work, I think.
*
* Revision 1.1 1995/02/02 16:21:52 quinn
@@
-27,18
+33,24
@@
int ber_integer(ODR o, int *val)
{
case ODR_DECODE:
if ((res = ber_decinteger(o->bp, val)) <= 0)
{
case ODR_DECODE:
if ((res = ber_decinteger(o->bp, val)) <= 0)
+ {
+ o->error = OPROTO;
return 0;
return 0;
+ }
o->bp += res;
o->left -= res;
return 1;
case ODR_ENCODE:
if ((res = ber_encinteger(o->bp, *val, o->left)) <= 0)
o->bp += res;
o->left -= res;
return 1;
case ODR_ENCODE:
if ((res = ber_encinteger(o->bp, *val, o->left)) <= 0)
+ {
+ o->error = OSPACE;
return 0;
return 0;
+ }
o->bp += res;
o->left -= res;
return 1;
case ODR_PRINT: return 1;
o->bp += res;
o->left -= res;
return 1;
case ODR_PRINT: return 1;
- default: return 0;
+ default: o->error = OOTHER; return 0;
}
}
}
}
@@
-66,7
+78,9
@@
int ber_encinteger(unsigned char *buf, int val, int maxlen)
b += len;
if (ber_enclen(lenpos, len, 1, 1) != 1)
return -1;
b += len;
if (ber_enclen(lenpos, len, 1, 1) != 1)
return -1;
+#ifdef ODR_DEBUG
fprintf(stderr, "[val=%d]", val);
fprintf(stderr, "[val=%d]", val);
+#endif
return b - buf;
}
return b - buf;
}
@@
-95,6
+109,8
@@
int ber_decinteger(unsigned char *buf, int *val)
*val = ntohl(tmp.i);
b += len;
*val = ntohl(tmp.i);
b += len;
+#ifdef ODR_DEBUG
fprintf(stderr, "[val=%d]", *val);
fprintf(stderr, "[val=%d]", *val);
+#endif
return b - buf;
}
return b - buf;
}