已合并
fuzz告警清理 #527
linjunjie61创建于 2024年11月8日
fuzz告警清理 #527
已合并
linjunjie61创建于 2024年11月8日
从refs/pull/527/head合入到master
共 26 个文件变更+26-50
@@ -30,7 +30,6 @@ using namespace OHOS::AAFwk;
30 30 
31namespace OHOS {31namespace OHOS {
32namespace {32namespace {
33-constexpr size_t FOO_MAX_LEN = 1024;
34constexpr size_t U32_AT_SIZE = 4;33constexpr size_t U32_AT_SIZE = 4;
35}34}
36bool DoSomethingInterestingWithMyAPI(const char* data, size_t size)35bool DoSomethingInterestingWithMyAPI(const char* data, size_t size)
@@ -80,7 +79,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
80 }79 }
81 80 
82 /* Validate the length of size */81 /* Validate the length of size */
83- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {82+ if (size < OHOS::U32_AT_SIZE) {
84 return 0;83 return 0;
85 }84 }
86 85 
@@ -26,7 +26,6 @@ using namespace OHOS::AAFwk;
26 26 
27namespace OHOS {27namespace OHOS {
28namespace {28namespace {
29-constexpr size_t FOO_MAX_LEN = 1024;
30constexpr size_t U32_AT_SIZE = 4;29constexpr size_t U32_AT_SIZE = 4;
31}30}
32uint32_t GetU32Data(const char* ptr)31uint32_t GetU32Data(const char* ptr)
@@ -63,7 +62,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
63 }62 }
64 63 
65 /* Validate the length of size */64 /* Validate the length of size */
66- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {65+ if (size < OHOS::U32_AT_SIZE) {
67 return 0;66 return 0;
68 }67 }
69 68 
@@ -32,7 +32,6 @@ using namespace OHOS::AAFwk;
32 32 
33namespace OHOS {33namespace OHOS {
34namespace {34namespace {
35-constexpr size_t FOO_MAX_LEN = 1024;
36constexpr size_t U32_AT_SIZE = 4;35constexpr size_t U32_AT_SIZE = 4;
37constexpr size_t MAX_ARRAY_SIZE = 50 * 1024 * 1024;36constexpr size_t MAX_ARRAY_SIZE = 50 * 1024 * 1024;
38}37}
@@ -77,7 +76,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
77 }76 }
78 77 
79 /* Validate the length of size */78 /* Validate the length of size */
80- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {79+ if (size < OHOS::U32_AT_SIZE) {
81 return 0;80 return 0;
82 }81 }
83 82 
@@ -28,7 +28,6 @@ using namespace OHOS::AAFwk;
28 28 
29namespace OHOS {29namespace OHOS {
30namespace {30namespace {
31-constexpr size_t FOO_MAX_LEN = 1024;
32constexpr size_t U32_AT_SIZE = 4;31constexpr size_t U32_AT_SIZE = 4;
33}32}
34uint32_t GetU32Data(const char* ptr)33uint32_t GetU32Data(const char* ptr)
@@ -63,7 +62,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
63 }62 }
64 63 
65 /* Validate the length of size */64 /* Validate the length of size */
66- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {65+ if (size < OHOS::U32_AT_SIZE) {
67 return 0;66 return 0;
68 }67 }
69 68 
@@ -29,7 +29,6 @@ using namespace OHOS::AAFwk;
29 29 
30namespace OHOS {30namespace OHOS {
31namespace {31namespace {
32-constexpr size_t FOO_MAX_LEN = 1024;
33constexpr size_t U32_AT_SIZE = 4;32constexpr size_t U32_AT_SIZE = 4;
34constexpr char LEFT_BRACE_STRING = '{';33constexpr char LEFT_BRACE_STRING = '{';
35}34}
@@ -81,7 +80,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
81 }80 }
82 81 
83 /* Validate the length of size */82 /* Validate the length of size */
84- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {83+ if (size < OHOS::U32_AT_SIZE) {
85 return 0;84 return 0;
86 }85 }
87 86 
@@ -26,7 +26,6 @@ using namespace OHOS::AAFwk;
26 26 
27namespace OHOS {27namespace OHOS {
28namespace {28namespace {
29-constexpr size_t FOO_MAX_LEN = 1024;
30constexpr size_t U32_AT_SIZE = 4;29constexpr size_t U32_AT_SIZE = 4;
31}30}
32 31 
@@ -56,7 +55,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
56 }55 }
57 56 
58 /* Validate the length of size */57 /* Validate the length of size */
59- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {58+ if (size < OHOS::U32_AT_SIZE) {
60 return 0;59 return 0;
61 }60 }
62 61 
@@ -26,7 +26,6 @@ using namespace OHOS::AAFwk;
26 26 
27namespace OHOS {27namespace OHOS {
28namespace {28namespace {
29-constexpr size_t FOO_MAX_LEN = 1024;
30constexpr size_t U32_AT_SIZE = 4;29constexpr size_t U32_AT_SIZE = 4;
31}30}
32 31 
@@ -54,7 +53,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
54 }53 }
55 54 
56 /* Validate the length of size */55 /* Validate the length of size */
57- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {56+ if (size < OHOS::U32_AT_SIZE) {
58 return 0;57 return 0;
59 }58 }
60 59 
@@ -26,7 +26,6 @@ using namespace OHOS::AAFwk;
26 26 
27namespace OHOS {27namespace OHOS {
28namespace {28namespace {
29-constexpr size_t FOO_MAX_LEN = 1024;
30constexpr size_t U32_AT_SIZE = 4;29constexpr size_t U32_AT_SIZE = 4;
31}30}
32uint32_t GetU32Data(const char* ptr)31uint32_t GetU32Data(const char* ptr)
@@ -57,7 +56,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
57 }56 }
58 57 
59 /* Validate the length of size */58 /* Validate the length of size */
60- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {59+ if (size < OHOS::U32_AT_SIZE) {
61 return 0;60 return 0;
62 }61 }
63 62 
@@ -89,7 +89,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
89 }89 }
90 90 
91 /* Validate the length of size */91 /* Validate the length of size */
92- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {92+ if (size < OHOS::U32_AT_SIZE) {
93 return 0;93 return 0;
94 }94 }
95 95 
@@ -29,7 +29,6 @@ using namespace OHOS::AAFwk;
29 29 
30namespace OHOS {30namespace OHOS {
31namespace {31namespace {
32-constexpr size_t FOO_MAX_LEN = 1024;
33constexpr size_t U32_AT_SIZE = 4;32constexpr size_t U32_AT_SIZE = 4;
34}33}
35bool DoSomethingInterestingWithMyAPI(const char* data, size_t size)34bool DoSomethingInterestingWithMyAPI(const char* data, size_t size)
@@ -90,7 +89,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
90 }89 }
91 90 
92 /* Validate the length of size */91 /* Validate the length of size */
93- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {92+ if (size < OHOS::U32_AT_SIZE) {
94 return 0;93 return 0;
95 }94 }
96 95 
@@ -28,7 +28,6 @@ using namespace OHOS::AAFwk;
28 28 
29namespace OHOS {29namespace OHOS {
30namespace {30namespace {
31-constexpr size_t FOO_MAX_LEN = 1024;
32constexpr size_t U32_AT_SIZE = 4;31constexpr size_t U32_AT_SIZE = 4;
33}32}
34 33 
@@ -51,7 +50,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
51 }50 }
52 51 
53 /* Validate the length of size */52 /* Validate the length of size */
54- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {53+ if (size < OHOS::U32_AT_SIZE) {
55 return 0;54 return 0;
56 }55 }
57 56 
@@ -26,7 +26,6 @@ using namespace OHOS::AAFwk;
26 26 
27namespace OHOS {27namespace OHOS {
28namespace {28namespace {
29-constexpr size_t FOO_MAX_LEN = 1024;
30constexpr size_t U32_AT_SIZE = 4;29constexpr size_t U32_AT_SIZE = 4;
31}30}
32 31 
@@ -55,7 +54,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
55 }54 }
56 55 
57 /* Validate the length of size */56 /* Validate the length of size */
58- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {57+ if (size < OHOS::U32_AT_SIZE) {
59 return 0;58 return 0;
60 }59 }
61 60 
@@ -28,7 +28,6 @@ using namespace OHOS::AAFwk;
28 28 
29namespace OHOS {29namespace OHOS {
30namespace {30namespace {
31-constexpr size_t FOO_MAX_LEN = 1024;
32constexpr size_t U32_AT_SIZE = 4;31constexpr size_t U32_AT_SIZE = 4;
33}32}
34 33 
@@ -82,7 +81,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
82 }81 }
83 82 
84 /* Validate the length of size */83 /* Validate the length of size */
85- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {84+ if (size < OHOS::U32_AT_SIZE) {
86 return 0;85 return 0;
87 }86 }
88 87 
@@ -29,7 +29,6 @@ using namespace OHOS::AAFwk;
29 29 
30namespace OHOS {30namespace OHOS {
31namespace {31namespace {
32-constexpr size_t FOO_MAX_LEN = 1024;
33constexpr size_t U32_AT_SIZE = 4;32constexpr size_t U32_AT_SIZE = 4;
34}33}
35uint32_t GetU32Data(const char* ptr)34uint32_t GetU32Data(const char* ptr)
@@ -87,7 +86,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
87 }86 }
88 87 
89 /* Validate the length of size */88 /* Validate the length of size */
90- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {89+ if (size < OHOS::U32_AT_SIZE) {
91 return 0;90 return 0;
92 }91 }
93 92 
@@ -28,7 +28,6 @@ using namespace OHOS::AAFwk;
28 28 
29namespace OHOS {29namespace OHOS {
30namespace {30namespace {
31-constexpr size_t FOO_MAX_LEN = 1024;
32constexpr size_t U32_AT_SIZE = 4;31constexpr size_t U32_AT_SIZE = 4;
33}32}
34uint32_t GetU32Data(const char* ptr)33uint32_t GetU32Data(const char* ptr)
@@ -68,7 +67,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
68 }67 }
69 68 
70 /* Validate the length of size */69 /* Validate the length of size */
71- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {70+ if (size < OHOS::U32_AT_SIZE) {
72 return 0;71 return 0;
73 }72 }
74 73 
@@ -28,7 +28,6 @@ using namespace OHOS::AAFwk;
28 28 
29namespace OHOS {29namespace OHOS {
30namespace {30namespace {
31-constexpr size_t FOO_MAX_LEN = 1024;
32constexpr size_t U32_AT_SIZE = 4;31constexpr size_t U32_AT_SIZE = 4;
33}32}
34uint32_t GetU32Data(const char* ptr)33uint32_t GetU32Data(const char* ptr)
@@ -77,7 +76,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
77 }76 }
78 77 
79 /* Validate the length of size */78 /* Validate the length of size */
80- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {79+ if (size < OHOS::U32_AT_SIZE) {
81 return 0;80 return 0;
82 }81 }
83 82 
@@ -196,7 +196,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
196 }196 }
197 197 
198 /* Validate the length of size */198 /* Validate the length of size */
199- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {199+ if (size < OHOS::U32_AT_SIZE) {
200 return 0;200 return 0;
201 }201 }
202 202 
@@ -41,7 +41,6 @@ using namespace OHOS::AAFwk;
41 41 
42namespace OHOS {42namespace OHOS {
43namespace {43namespace {
44-constexpr size_t FOO_MAX_LEN = 1024;
45constexpr size_t U32_AT_SIZE = 4;44constexpr size_t U32_AT_SIZE = 4;
46constexpr size_t PARAMS_SIZE = 21;45constexpr size_t PARAMS_SIZE = 21;
47constexpr int32_t OTHER = -2;46constexpr int32_t OTHER = -2;
@@ -172,7 +171,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
172 }171 }
173 172 
174 /* Validate the length of size */173 /* Validate the length of size */
175- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {174+ if (size < OHOS::U32_AT_SIZE) {
176 return 0;175 return 0;
177 }176 }
178 177 
@@ -31,7 +31,6 @@ using namespace OHOS::AAFwk;
31 31 
32namespace OHOS {32namespace OHOS {
33namespace {33namespace {
34-constexpr size_t FOO_MAX_LEN = 1024;
35constexpr size_t U32_AT_SIZE = 4;34constexpr size_t U32_AT_SIZE = 4;
36}35}
37uint32_t GetU32Data(const char* ptr)36uint32_t GetU32Data(const char* ptr)
@@ -77,7 +76,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
77 }76 }
78 77 
79 /* Validate the length of size */78 /* Validate the length of size */
80- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {79+ if (size < OHOS::U32_AT_SIZE) {
81 return 0;80 return 0;
82 }81 }
83 82 
@@ -41,7 +41,6 @@ using namespace OHOS::AAFwk;
41 41 
42namespace OHOS {42namespace OHOS {
43namespace {43namespace {
44-constexpr size_t FOO_MAX_LEN = 1024;
45constexpr size_t U32_AT_SIZE = 4;44constexpr size_t U32_AT_SIZE = 4;
46constexpr size_t BOOLEAN_TO_STRING = 10;45constexpr size_t BOOLEAN_TO_STRING = 10;
47constexpr int32_t ARRAY_SIZE = 5;46constexpr int32_t ARRAY_SIZE = 5;
@@ -214,7 +213,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
214 }213 }
215 214 
216 /* Validate the length of size */215 /* Validate the length of size */
217- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {216+ if (size < OHOS::U32_AT_SIZE) {
218 return 0;217 return 0;
219 }218 }
220 219 
@@ -29,7 +29,6 @@ using namespace OHOS::AAFwk;
29 29 
30namespace OHOS {30namespace OHOS {
31namespace {31namespace {
32-constexpr size_t FOO_MAX_LEN = 1024;
33constexpr size_t U32_AT_SIZE = 4;32constexpr size_t U32_AT_SIZE = 4;
34}33}
35uint32_t GetU32Data(const char* ptr)34uint32_t GetU32Data(const char* ptr)
@@ -75,7 +74,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
75 }74 }
76 75 
77 /* Validate the length of size */76 /* Validate the length of size */
78- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {77+ if (size < OHOS::U32_AT_SIZE) {
79 return 0;78 return 0;
80 }79 }
81 80 
@@ -31,7 +31,6 @@ using namespace OHOS::AAFwk;
31 31 
32namespace OHOS {32namespace OHOS {
33namespace {33namespace {
34-constexpr size_t FOO_MAX_LEN = 1024;
35constexpr size_t U32_AT_SIZE = 4;34constexpr size_t U32_AT_SIZE = 4;
36}35}
37uint32_t GetU32Data(const char* ptr)36uint32_t GetU32Data(const char* ptr)
@@ -75,7 +74,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
75 }74 }
76 75 
77 /* Validate the length of size */76 /* Validate the length of size */
78- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {77+ if (size < OHOS::U32_AT_SIZE) {
79 return 0;78 return 0;
80 }79 }
81 80 
@@ -28,7 +28,6 @@ using namespace OHOS::AAFwk;
28 28 
29namespace OHOS {29namespace OHOS {
30namespace {30namespace {
31-constexpr size_t FOO_MAX_LEN = 1024;
32constexpr size_t U32_AT_SIZE = 4;31constexpr size_t U32_AT_SIZE = 4;
33}32}
34uint32_t GetU32Data(const char* ptr)33uint32_t GetU32Data(const char* ptr)
@@ -66,7 +65,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
66 }65 }
67 66 
68 /* Validate the length of size */67 /* Validate the length of size */
69- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {68+ if (size < OHOS::U32_AT_SIZE) {
70 return 0;69 return 0;
71 }70 }
72 71 
@@ -28,7 +28,6 @@ using namespace OHOS::AAFwk;
28 28 
29namespace OHOS {29namespace OHOS {
30namespace {30namespace {
31-constexpr size_t FOO_MAX_LEN = 1024;
32constexpr size_t U32_AT_SIZE = 4;31constexpr size_t U32_AT_SIZE = 4;
33constexpr uint8_t ENABLE = 2;32constexpr uint8_t ENABLE = 2;
34}33}
@@ -86,7 +85,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
86 }85 }
87 86 
88 /* Validate the length of size */87 /* Validate the length of size */
89- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {88+ if (size < OHOS::U32_AT_SIZE) {
90 return 0;89 return 0;
91 }90 }
92 91 
@@ -28,7 +28,6 @@ using namespace OHOS::AAFwk;
28 28 
29namespace OHOS {29namespace OHOS {
30namespace {30namespace {
31-constexpr size_t FOO_MAX_LEN = 1024;
32constexpr size_t U32_AT_SIZE = 4;31constexpr size_t U32_AT_SIZE = 4;
33}32}
34uint32_t GetU32Data(const char* ptr)33uint32_t GetU32Data(const char* ptr)
@@ -116,7 +115,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
116 }115 }
117 116 
118 /* Validate the length of size */117 /* Validate the length of size */
119- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {118+ if (size < OHOS::U32_AT_SIZE) {
120 return 0;119 return 0;
121 }120 }
122 121 
@@ -28,7 +28,6 @@ using namespace OHOS::AAFwk;
28 28 
29namespace OHOS {29namespace OHOS {
30namespace {30namespace {
31-constexpr size_t FOO_MAX_LEN = 1024;
32constexpr size_t U32_AT_SIZE = 4;31constexpr size_t U32_AT_SIZE = 4;
33}32}
34uint32_t GetU32Data(const char* ptr)33uint32_t GetU32Data(const char* ptr)
@@ -334,7 +333,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
334 }333 }
335 334 
336 /* Validate the length of size */335 /* Validate the length of size */
337- if (size > OHOS::FOO_MAX_LEN || size < OHOS::U32_AT_SIZE) {336+ if (size < OHOS::U32_AT_SIZE) {
338 return 0;337 return 0;
339 }338 }
340 339