diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-10-04 05:12:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-10-04 05:12:34 +0300 |
commit | e7274dedc4475e15cd06a7c83ec9e0d477f13314 (patch) | |
tree | 858b6e2aa31c6e46e67cd5b50756c7a099b462a3 /source | |
parent | cc8fa3ee909927c817b881b39f806b0753c80b86 (diff) |
Fix possible NULL pointer deference
The pointer was referenced before being checked.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/asset/intern/asset_library_reference_enum.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/asset/intern/asset_library_reference_enum.cc b/source/blender/editors/asset/intern/asset_library_reference_enum.cc index 5a8fed6fea1..c7c0f35c12d 100644 --- a/source/blender/editors/asset/intern/asset_library_reference_enum.cc +++ b/source/blender/editors/asset/intern/asset_library_reference_enum.cc @@ -80,14 +80,16 @@ AssetLibraryReference ED_asset_library_reference_from_enum_value(int value) /* Note that there is no check if the path exists here. If an invalid library path is used, the * Asset Browser can give a nice hint on what's wrong. */ - const bool is_valid = (user_library->name[0] && user_library->path[0]); if (!user_library) { library.type = ASSET_LIBRARY_LOCAL; library.custom_library_index = -1; } - else if (user_library && is_valid) { - library.custom_library_index = value - ASSET_LIBRARY_CUSTOM; - library.type = ASSET_LIBRARY_CUSTOM; + else { + const bool is_valid = (user_library->name[0] && user_library->path[0]); + if (is_valid) { + library.custom_library_index = value - ASSET_LIBRARY_CUSTOM; + library.type = ASSET_LIBRARY_CUSTOM; + } } return library; } |