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
Revert change in default.bib WRT YAZ-844
[yaz-moved-to-github.git]
/
src
/
ber_oct.c
diff --git
a/src/ber_oct.c
b/src/ber_oct.c
index
5a36482
..
a88da37
100644
(file)
--- a/
src/ber_oct.c
+++ b/
src/ber_oct.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-27,15
+27,15
@@
int ber_octetstring(ODR o, Odr_oct *p, int cons)
switch (o->direction)
{
case ODR_DECODE:
switch (o->direction)
{
case ODR_DECODE:
- if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0)
+ if ((res = ber_declen(o->op->bp, &len, odr_max(o))) < 0)
{
odr_seterror(o, OPROTO, 14);
return 0;
}
{
odr_seterror(o, OPROTO, 14);
return 0;
}
- o->bp += res;
+ o->op->bp += res;
if (cons) /* fetch component strings */
{
if (cons) /* fetch component strings */
{
- base = o->bp;
+ base = o->op->bp;
while (odp_more_chunks(o, base, len))
if (!odr_octetstring(o, &p, 0, 0))
return 0;
while (odp_more_chunks(o, base, len))
if (!odr_octetstring(o, &p, 0, 0))
return 0;
@@
-53,10
+53,8
@@
int ber_octetstring(ODR o, Odr_oct *p, int cons)
return 0;
}
p->len = len;
return 0;
}
p->len = len;
- p->buf = odr_malloc(o, len + 1);
- memcpy(p->buf, o->bp, len);
- p->buf[len] = '\0';
- o->bp += len;
+ p->buf = odr_strdupn(o, o->op->bp, len);
+ o->op->bp += len;
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)