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
/
ber_oct.c
diff --git
a/odr/ber_oct.c
b/odr/ber_oct.c
index
898ad4d
..
e12fedb
100644
(file)
--- a/
odr/ber_oct.c
+++ b/
odr/ber_oct.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2001, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_oct.c,v $
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_oct.c,v $
- * Revision 1.16 2000-02-29 13:44:55 adam
+ * Revision 1.18 2001-06-26 13:03:48 adam
+ * Bug fix: introduced by previous commit.
+ *
+ * Revision 1.17 2001/06/26 12:14:15 adam
+ * When BER decoding a null byte is appended to the OCTET buffer.
+ *
+ * Revision 1.16 2000/02/29 13:44:55 adam
* Check for config.h (currently not generated).
*
* Revision 1.15 2000/01/31 13:15:21 adam
* Check for config.h (currently not generated).
*
* Revision 1.15 2000/01/31 13:15:21 adam
@@
-103,6
+109,10
@@
int ber_octetstring(ODR o, Odr_oct *p, int cons)
memcpy(p->buf + p->len, o->bp, len);
p->len += len;
o->bp += len;
memcpy(p->buf + p->len, o->bp, len);
p->len += len;
o->bp += len;
+ /* the final null is really not part of the buffer, but */
+ /* it helps somes applications that assumes C strings */
+ if (len)
+ p->buf[p->len] = '\0';
return 1;
case ODR_ENCODE:
if ((res = ber_enclen(o, p->len, 5, 0)) < 0)
return 1;
case ODR_ENCODE:
if ((res = ber_enclen(o, p->len, 5, 0)) < 0)