From ab69af8c30a0985748224b94509350fd6eb127ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 13 Jul 2005 10:40:23 +0000 Subject: [PATCH] (TChoice): add () to make sure variable expression is evaluated correctly git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15646 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/asn1/gen_encode.c | 8 ++++---- lib/asn1/gen_length.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/asn1/gen_encode.c b/lib/asn1/gen_encode.c index 6128d9be1..f3472d0e5 100644 --- a/lib/asn1/gen_encode.c +++ b/lib/asn1/gen_encode.c @@ -411,11 +411,11 @@ encode_type (const char *name, const Type *t) if (have_ellipsis) { fprintf(codefile, "case %s: {\n" - "if (len < %s->u.%s.length)\n" + "if (len < (%s)->u.%s.length)\n" "return ASN1_OVERFLOW;\n" - "p -= %s->u.%s.length;\n" - "ret += %s->u.%s.length;\n" - "memcpy(p + 1, %s->u.%s.data, %s->u.%s.length);\n" + "p -= (%s)->u.%s.length;\n" + "ret += (%s)->u.%s.length;\n" + "memcpy(p + 1, (%s)->u.%s.data, (%s)->u.%s.length);\n" "break;\n" "}\n", have_ellipsis->label, diff --git a/lib/asn1/gen_length.c b/lib/asn1/gen_length.c index ee8340b53..9ab1580c9 100644 --- a/lib/asn1/gen_length.c +++ b/lib/asn1/gen_length.c @@ -171,7 +171,7 @@ length_type (const char *name, const Type *t, const char *variable) if (have_ellipsis) fprintf(codefile, "case %s:\n" - "ret += %s->u.%s.length;\n" + "ret += (%s)->u.%s.length;\n" "break;\n", have_ellipsis->label, name,