[Bf-blender-cvs] [822501d86df] blender-v3.0-release: Cleanup: Avoid possible NULL pointer error

Antonio Vazquez noreply at git.blender.org
Thu Jan 20 21:25:30 CET 2022


Commit: 822501d86df99fd83ee4f2a745daeb7ef4556f22
Author: Antonio Vazquez
Date:   Tue Jan 18 13:44:27 2022 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB822501d86df99fd83ee4f2a745daeb7ef4556f22

Cleanup: Avoid possible NULL pointer error

In normal conditions, `gpf` always has a value, but better move inside the NULL checking.

===================================================================

M	source/blender/editors/gpencil/editaction_gpencil.c

===================================================================

diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c
index 58f3eba39a4..15903f2fceb 100644
--- a/source/blender/editors/gpencil/editaction_gpencil.c
+++ b/source/blender/editors/gpencil/editaction_gpencil.c
@@ -476,9 +476,10 @@ bool ED_gpencil_anim_copybuf_paste(bAnimContext *ac, const short offset_mode)
 
       /* get frame to copy data into (if no frame returned, then just ignore) */
       gpf = BKE_gpencil_layer_frame_get(gpld, gpfs->framenum, GP_GETFRAME_ADD_NEW);
-      /* Ensure to use same keyframe type. */
-      gpf->key_type = gpfs->key_type;
       if (gpf) {
+        /* Ensure to use same keyframe type. */
+        gpf->key_type = gpfs->key_type;
+
         bGPDstroke *gps, *gpsn;
 
         /* This should be the right frame... as it may be a pre-existing frame,



More information about the Bf-blender-cvs mailing list