diff options
| author |   canacar <canacar@openbsd.org> | 2007-11-03 19:17:47 +0000 |
|---|---|---|
| committer | canacar <canacar@openbsd.org> | 2007-11-03 19:17:47 +0000 |
| commit | a88f44c78b03fc93406d94abf1ab4047fde94836 (patch) | |
| tree | 7825fe490660f1dedfd372bc612c476e026281fb | |
| parent | PR 5621 - spamd doesn't clear the last entry from an empty TRAP list, (diff) | |
| download | wireguard-openbsd-a88f44c78b03fc93406d94abf1ab4047fde94836.tar.xz wireguard-openbsd-a88f44c78b03fc93406d94abf1ab4047fde94836.zip | |
Add missing else so that Concatanation of two buffers work.
Noticed by robert@ while diagnosing a problem report by
Johan Lindman. ok weingart@
| -rw-r--r-- | sys/dev/acpi/dsdt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c index 8d7c6a5ce14..d60526f2244 100644 --- a/sys/dev/acpi/dsdt.c +++ b/sys/dev/acpi/dsdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.c,v 1.94 2007/11/03 19:06:07 canacar Exp $ */ +/* $OpenBSD: dsdt.c,v 1.95 2007/11/03 19:17:47 canacar Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> * @@ -3155,8 +3155,7 @@ aml_parsestring(struct aml_scope *scope, int opcode, struct aml_value *res) memcpy(&tmpval[AML_LHS].v_buffer+tmpval[AML_LHS].length, tmpval[AML_RHS].v_buffer, tmpval[AML_RHS].length); aml_setvalue(scope, &tmpval[AML_DST], &tmpval[AML_LHS], 0); - } - if (tmpval[AML_LHS].type == AML_OBJTYPE_STRING && + } else if (tmpval[AML_LHS].type == AML_OBJTYPE_STRING && tmpval[AML_RHS].type == AML_OBJTYPE_STRING) { aml_resize(&tmpval[AML_LHS], tmpval[AML_LHS].length+tmpval[AML_RHS].length); |