diff options
| author | Simon Tatham <anakin@pobox.com> | 2021-12-11 11:13:00 +0000 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2021-12-11 11:59:25 +0000 |
| commit | 57fbcd2b29aa74423d47a9efd783a1508ab1bfc5 (patch) | |
| tree | 9c8d1664994e582cddbd3402da0afe4c70f0c8f0 /tree234.c | |
| parent | 5c5c607fdb834bc73033736f5774ef53c42008aa (diff) | |
| download | puzzles-57fbcd2b29aa74423d47a9efd783a1508ab1bfc5.zip puzzles-57fbcd2b29aa74423d47a9efd783a1508ab1bfc5.tar.gz puzzles-57fbcd2b29aa74423d47a9efd783a1508ab1bfc5.tar.bz2 puzzles-57fbcd2b29aa74423d47a9efd783a1508ab1bfc5.tar.xz | |
malloc.c: check allocation sizes against PTRDIFF_MAX.
I don't expect this to actually come up in any circumstance, but it
prevents a warning in some versions of gcc that would otherwise arise
from the use of 'int' to compute the input size: if gcc isn't
confident that the int is positive, then it complains that possible
inputs to malloc might be in the region of 2^64 - (small multiple of a
negative 32-bit int).
I would hope malloc would fail in any case on such an input, so
failing a couple of lines earlier makes no important difference.
Annoyingly, stdint.h is missing in my NestedVM build setup (though it
has stdbool.h - it's not _totally_ C90). So I have to check that at
cmake time.
Also, removed the #defines for smalloc and friends from the tree234
test mode. These were needed in the old build system, when
tree234-test was built ad-hoc without being linked against malloc.c.
But now tree234-test links against the same utils library as
everything else, and can use the real smalloc - and doing so prevents
another of these warnings when compiling with -flto.
Diffstat (limited to '')
| -rw-r--r-- | tree234.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -43,9 +43,6 @@ static void logprintf(const char *fmt, ...) va_end(ap); } #define LOG(x) (logprintf x) -#define smalloc malloc -#define srealloc realloc -#define sfree free #else #define LOG(x) #endif |