fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 23:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

clang-tidy param avoid malloc(0)

Browse Source
This commit is contained in:
Daniel Agar
2017-06-02 19:35:18 -04:00
parent 2e0ed3b47b
commit 768faa1ae3
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.clang-tidy
+3 -4
View File
@@ -16,9 +16,9 @@ Checks: '*
,-clang-analyzer-optin.performance.Padding ,-clang-analyzer-optin.performance.Padding
,-clang-analyzer-security.FloatLoopCounter ,-clang-analyzer-security.FloatLoopCounter
,-clang-analyzer-security.insecureAPI.strcpy ,-clang-analyzer-security.insecureAPI.strcpy
,-clang-analyzer-unix.API
,-clang-analyzer-unix.cstring.BadSizeArg ,-clang-analyzer-unix.cstring.BadSizeArg
,-clang-analyzer-unix.Malloc ,-clang-analyzer-unix.Malloc
,-clang-analyzer-unix.MallocSizeof
,-cppcoreguidelines-c-copy-assignment-signature ,-cppcoreguidelines-c-copy-assignment-signature
,-cppcoreguidelines-interfaces-global-init ,-cppcoreguidelines-interfaces-global-init
,-cppcoreguidelines-no-malloc ,-cppcoreguidelines-no-malloc
@@ -59,6 +59,7 @@ Checks: '*
,-modernize-use-equals-delete ,-modernize-use-equals-delete
,-modernize-use-override ,-modernize-use-override
,-modernize-use-using ,-modernize-use-using
,-performance-inefficient-string-concatenation
,-readability-avoid-const-params-in-decls ,-readability-avoid-const-params-in-decls
,-readability-else-after-return ,-readability-else-after-return
,-readability-implicit-bool-cast ,-readability-implicit-bool-cast
@@ -66,8 +67,6 @@ Checks: '*
,-readability-named-parameter ,-readability-named-parameter
,-readability-non-const-parameter ,-readability-non-const-parameter
,-readability-redundant-declaration ,-readability-redundant-declaration
,-performance-inefficient-string-concatenation
,-clang-analyzer-unix.MallocSizeof
,-readability-redundant-member-init ,-readability-redundant-member-init
,-readability-simplify-boolean-expr ,-readability-simplify-boolean-expr
' '
@@ -86,4 +85,4 @@ CheckOptions:
- key: readability-function-size.LineThreshold - key: readability-function-size.LineThreshold
value: '4000' value: '4000'
- key: readability-function-size.StatementThreshold - key: readability-function-size.StatementThreshold
value: '4000' value: '4000'
src/modules/systemlib/param/param.c
+16 -2
View File
@@ -727,7 +727,14 @@ param_set_internal(param_t param, const void *val, bool mark_saved, bool notify_
case PARAM_TYPE_STRUCT ... PARAM_TYPE_STRUCT_MAX: case PARAM_TYPE_STRUCT ... PARAM_TYPE_STRUCT_MAX:
if (s->val.p == NULL) { if (s->val.p == NULL) {
s->val.p = malloc(param_size(param)); size_t psize = param_size(param);
if (psize > 0) {
s->val.p = malloc(psize);
} else {
s->val.p = NULL;
}
if (s->val.p == NULL) { if (s->val.p == NULL) {
debug("failed to allocate parameter storage"); debug("failed to allocate parameter storage");
@@ -1168,7 +1175,14 @@ param_import_callback(bson_decoder_t decoder, void *private, bson_node_t node)
} }
/* XXX check actual file data size? */ /* XXX check actual file data size? */
tmp = malloc(param_size(param)); size_t psize = param_size(param);
if (psize > 0) {
tmp = malloc(psize);
} else {
tmp = NULL;
}
if (tmp == NULL) { if (tmp == NULL) {
debug("failed allocating for '%s'", node->name); debug("failed allocating for '%s'", node->name);