diff options
| author | jkim <jkim@FreeBSD.org> | 2013-10-17 00:06:42 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-10-17 00:06:42 +0000 |
| commit | f4a31baa14e08b26c3b63f02571280c872cabe90 (patch) | |
| tree | 3908357b831dbb78c746f73c443b4d7ba5e966f9 /source/components/debugger/dbnames.c | |
| parent | b2a92415360aacb32d9b6107bdcf100d16d09167 (diff) | |
| download | FreeBSD-src-f4a31baa14e08b26c3b63f02571280c872cabe90.zip FreeBSD-src-f4a31baa14e08b26c3b63f02571280c872cabe90.tar.gz | |
Import ACPICA 20130927.
Diffstat (limited to 'source/components/debugger/dbnames.c')
| -rw-r--r-- | source/components/debugger/dbnames.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/source/components/debugger/dbnames.c b/source/components/debugger/dbnames.c index e3c6d71..c071289 100644 --- a/source/components/debugger/dbnames.c +++ b/source/components/debugger/dbnames.c @@ -171,8 +171,7 @@ AcpiDbSetScope ( goto ErrorExit; } - ACPI_STRCPY (AcpiGbl_DbScopeBuf, Name); - ACPI_STRCAT (AcpiGbl_DbScopeBuf, "\\"); + AcpiGbl_DbScopeBuf[0] = 0; } else { @@ -184,9 +183,22 @@ AcpiDbSetScope ( { goto ErrorExit; } + } + + /* Build the final pathname */ + + if (AcpiUtSafeStrcat (AcpiGbl_DbScopeBuf, sizeof (AcpiGbl_DbScopeBuf), + Name)) + { + Status = AE_BUFFER_OVERFLOW; + goto ErrorExit; + } - ACPI_STRCAT (AcpiGbl_DbScopeBuf, Name); - ACPI_STRCAT (AcpiGbl_DbScopeBuf, "\\"); + if (AcpiUtSafeStrcat (AcpiGbl_DbScopeBuf, sizeof (AcpiGbl_DbScopeBuf), + "\\")) + { + Status = AE_BUFFER_OVERFLOW; + goto ErrorExit; } AcpiGbl_DbScopeNode = Node; |
