diff options
| author | Roger Peppe <rogpeppe@gmail.com> | 2018-01-08 18:47:02 +0000 |
|---|---|---|
| committer | Ingy döt Net <ingy@ingy.net> | 2018-01-11 09:36:31 -0800 |
| commit | 01f3a8786127748b5bbd4614880c4484570bbd44 (patch) | |
| tree | 75a1be2742c0b66aabe8d3e46641714eff1841f3 /src | |
| parent | d050fe3f3006b55edf33a2ef91019a67d6c3fb10 (diff) | |
| download | libyaml-git-01f3a8786127748b5bbd4614880c4484570bbd44.tar.gz | |
Remove need for PTRDIFF_MAX
It's just as easy to calculate the maximum value directly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/reader.c | 6 | ||||
| -rw-r--r-- | src/yaml_private.h | 33 |
2 files changed, 14 insertions, 25 deletions
diff --git a/src/reader.c b/src/reader.c index f1a06de..f3ac54c 100644 --- a/src/reader.c +++ b/src/reader.c @@ -460,10 +460,10 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length) } - if (parser->offset >= PTRDIFF_MAX) + if (parser->offset >= MAX_FILE_SIZE) { return yaml_parser_set_reader_error(parser, "input is too long", - PTRDIFF_MAX, -1); + parser->offset, -1); + } return 1; } - diff --git a/src/yaml_private.h b/src/yaml_private.h index fe25141..eb72207 100644 --- a/src/yaml_private.h +++ b/src/yaml_private.h @@ -8,28 +8,6 @@ #include <limits.h> #include <stddef.h> -#ifndef _MSC_VER -#if defined(__sun) || defined(__sun__) -#include <sys/inttypes.h> -#define PTRDIFF_MAX INT_MAX -#else -#include <stdint.h> -#ifndef PTRDIFF_MAX /* gcc on HP-UX */ -#ifdef _LP64 -#define PTRDIFF_MAX 0x7FFFFFFFFFFFFFFFLL -#else -#define PTRDIFF_MAX 0x7FFFFFFFL -#endif -#endif -#endif -#else -#ifdef _WIN64 -#define PTRDIFF_MAX _I64_MAX -#else -#define PTRDIFF_MAX INT_MAX -#endif -#endif - /* * Memory management. */ @@ -89,6 +67,17 @@ yaml_parser_fetch_more_tokens(yaml_parser_t *parser); #define OUTPUT_RAW_BUFFER_SIZE (OUTPUT_BUFFER_SIZE*2+2) /* + * The maximum size of a YAML input file. + * This used to be PTRDIFF_MAX, but that's not entirely portable + * because stdint.h isn't available on all platforms. + * It is not entirely clear why this isn't the maximum value + * that can fit into the parser->offset field. + */ + +#define MAX_FILE_SIZE (~(size_t)0 / 2) + + +/* * The size of other stacks and queues. */ |