aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs/backtrace/elf.c
diff options
context:
space:
mode:
authorrobot-dts-analyst <robot-dts-analyst@yandex-team.com>2022-07-18 09:37:30 +0300
committerrobot-dts-analyst <robot-dts-analyst@yandex-team.com>2022-07-18 09:37:30 +0300
commit1c76409f8739c0d8caa4ca6acb2937821b488980 (patch)
treea01e0c8937b65735107256baa69156991ab26850 /contrib/libs/backtrace/elf.c
parent35f384333e79f31b5a26e8d4219fd7e5bf40f0f1 (diff)
downloadydb-1c76409f8739c0d8caa4ca6acb2937821b488980.tar.gz
rebalancing in sandbox task 1379675374
rebalancing
Diffstat (limited to 'contrib/libs/backtrace/elf.c')
-rw-r--r--contrib/libs/backtrace/elf.c27
1 files changed, 16 insertions, 11 deletions
diff --git a/contrib/libs/backtrace/elf.c b/contrib/libs/backtrace/elf.c
index 941f820d944..77a1a728fda 100644
--- a/contrib/libs/backtrace/elf.c
+++ b/contrib/libs/backtrace/elf.c
@@ -1,5 +1,5 @@
/* elf.c -- Get debug data from an ELF file for backtraces.
- Copyright (C) 2012-2020 Free Software Foundation, Inc.
+ Copyright (C) 2012-2021 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,12 @@ POSSIBILITY OF SUCH DAMAGE. */
#include <unistd.h>
#ifdef HAVE_DL_ITERATE_PHDR
-#include <link.h>
+ #ifdef HAVE_LINK_H
+ #include <link.h>
+ #endif
+ #ifdef HAVE_SYS_LINK_H
+ #error #include <sys/link.h>
+ #endif
#endif
#include "backtrace.h"
@@ -1796,7 +1801,7 @@ elf_zlib_inflate (const unsigned char *pin, size_t sin, uint16_t *zdebug_table,
/* An uncompressed block. */
/* If we've read ahead more than a byte, back up. */
- while (bits > 8)
+ while (bits >= 8)
{
--pin;
bits -= 8;
@@ -2081,10 +2086,10 @@ elf_zlib_inflate (const unsigned char *pin, size_t sin, uint16_t *zdebug_table,
{
case 6:
*plen++ = prev;
- /* fallthrough */
+ ATTRIBUTE_FALLTHROUGH;
case 5:
*plen++ = prev;
- /* fallthrough */
+ ATTRIBUTE_FALLTHROUGH;
case 4:
*plen++ = prev;
}
@@ -2115,22 +2120,22 @@ elf_zlib_inflate (const unsigned char *pin, size_t sin, uint16_t *zdebug_table,
{
case 10:
*plen++ = 0;
- /* fallthrough */
+ ATTRIBUTE_FALLTHROUGH;
case 9:
*plen++ = 0;
- /* fallthrough */
+ ATTRIBUTE_FALLTHROUGH;
case 8:
*plen++ = 0;
- /* fallthrough */
+ ATTRIBUTE_FALLTHROUGH;
case 7:
*plen++ = 0;
- /* fallthrough */
+ ATTRIBUTE_FALLTHROUGH;
case 6:
*plen++ = 0;
- /* fallthrough */
+ ATTRIBUTE_FALLTHROUGH;
case 5:
*plen++ = 0;
- /* fallthrough */
+ ATTRIBUTE_FALLTHROUGH;
case 4:
*plen++ = 0;
}