json-c/backport-Take-2-fixing-the-placement-of-json_tokener_error_memory.patch
sun_hai_10 3eea77c225 Take 2 fixing the placement of json_tokener_error_memory in the enum.
(cherry picked from commit 5adf298743c2808d92a6076682c989b65f8af2b8)
2024-09-24 17:30:57 +08:00

31 lines
1009 B
Diff

From ad8b8afa7d567053b87f2d37ee4a534e13c210c7 Mon Sep 17 00:00:00 2001
From: Eric Hawicz <erh+git@nimenees.com>
Date: Fri, 22 Sep 2023 22:26:21 -0400
Subject: [PATCH] Take 2 fixing the placement of json_tokener_error_memory in
the enum. (json_tokener_error_size is an actual error, *not* a measure of
the size of the enum!)
Reference:https://github.com/json-c/json-c/commit/ad8b8afa7d567053b87f2d37ee4a534e13c210c7
Conflict:NA
---
json_tokener.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/json_tokener.h b/json_tokener.h
index 77abc5c18d..cdac3e2afe 100644
--- a/json_tokener.h
+++ b/json_tokener.h
@@ -40,8 +40,8 @@ enum json_tokener_error
json_tokener_error_parse_string,
json_tokener_error_parse_comment,
json_tokener_error_parse_utf8_string,
- json_tokener_error_memory,
- json_tokener_error_size
+ json_tokener_error_size, /* A string longer than INT32_MAX was passed as input */
+ json_tokener_error_memory /* Failed to allocate memory */
};
/**
--
2.43.4