*** empty log message ***
diff --git a/asn1c/tests/check-22.c b/asn1c/tests/check-22.c
index f50286b..6cfdd7a 100644
--- a/asn1c/tests/check-22.c
+++ b/asn1c/tests/check-22.c
@@ -47,6 +47,7 @@
static void
check(int is_ok, uint8_t *buf, int size, size_t consumed) {
T1_t t, *tp;
+ void *tpp = &tp;
asn_dec_rval_t rval;
asn_enc_rval_t erval;
int ret;
@@ -55,7 +56,7 @@
tp = memset(&t, 0, sizeof(t));
fprintf(stderr, "Buf %p\n", buf);
- rval = ber_decode(0, &asn_DEF_T1, (void **)&tp, buf, size);
+ rval = ber_decode(0, &asn_DEF_T1, (void **)tpp, buf, size);
fprintf(stderr, "Returned code %d, consumed %d\n",
(int)rval.code, (int)rval.consumed);
diff --git a/asn1c/tests/check-32.c b/asn1c/tests/check-32.c
index 0fdbee9..edc7bfa 100644
--- a/asn1c/tests/check-32.c
+++ b/asn1c/tests/check-32.c
@@ -18,7 +18,6 @@
asn_enc_rval_t erv;
asn_dec_rval_t drv;
char buf[128];
- size_t bufsize = sizeof(buf);
(void)ac; /* Unused argument */
(void)av; /* Unused argument */
@@ -44,35 +43,36 @@
* Encode the sequence.
*/
erv = der_encode_to_buffer(&asn_DEF_SeqWithMandatory,
- &swm, buf, &bufsize);
- assert(erv.encoded == bufsize);
+ &swm, buf, sizeof buf);
+ assert(erv.encoded > 0);
+ buf[erv.encoded] = '\0';
/*
* Try to decode it using a compatible type.
*/
drv = ber_decode(0, &asn_DEF_SeqWithOptional, (void **)&swo,
- buf, bufsize);
+ buf, erv.encoded);
assert(drv.code == RC_OK);
- assert(drv.consumed == bufsize);
+ assert(drv.consumed == erv.encoded);
assert(swo->seqOfOpt != 0);
xer_fprint(stderr, &asn_DEF_SeqWithOptional, swo);
swo->seqOfOpt = 0;
- bufsize = sizeof(buf);
erv = der_encode_to_buffer(&asn_DEF_SeqWithOptional,
- swo, buf, &bufsize);
- assert(erv.encoded == bufsize);
+ swo, buf, sizeof buf);
+ assert(erv.encoded > 0);
+ buf[erv.encoded] = '\0';
swo = 0;
drv = ber_decode(0, &asn_DEF_SeqWithMandatory, (void **)&swo,
- buf, bufsize);
+ buf, erv.encoded);
assert(drv.code != RC_OK);
swo = 0;
drv = ber_decode(0, &asn_DEF_SeqWithOptional, (void **)&swo,
- buf, bufsize);
+ buf, erv.encoded);
assert(drv.code == RC_OK);
- assert(drv.consumed == bufsize);
+ assert(drv.consumed == erv.encoded);
assert(swo->seqOfOpt == 0);
xer_fprint(stderr, &asn_DEF_SeqWithOptional, swo);