Check if locs is not null before try to access (#5622)

maiconpintoabreu · web-flow · commit 2eaac95df080 · 2026-03-04T19:16:22.000+01:00
diff --git a/src/external/rlsw.h b/src/external/rlsw.h
@@ -3446,7 +3446,7 @@ static inline bool sw_is_texture_valid(uint32_t id)
     else if (id >= SW_MAX_TEXTURES) valid = false;
     else if (RLSW.loadedTextures[id].pixels == NULL) valid = false;
 
-    return true;
+    return valid;
 }
 
 static inline bool sw_is_texture_filter_valid(int filter)
diff --git a/src/rmodels.c b/src/rmodels.c
@@ -3928,7 +3928,7 @@ void DrawModelEx(Model model, Vector3 position, Vector3 rotationAxis, float rota
 
         // Upload runtime bone transforms matrices, to compute skinning on the shader (GPU-skinning)
         // NOTE: Required location must be found and Mesh bones indices and weights must be also uploaded to shader
-        if ((mat.shader.locs[SHADER_LOC_MATRIX_BONETRANSFORMS] != -1) && (model.boneMatrices != NULL))
+        if (mat.shader.locs != NULL && (mat.shader.locs[SHADER_LOC_MATRIX_BONETRANSFORMS] != -1) && (model.boneMatrices != NULL))
         {
             rlEnableShader(mat.shader.id); // Enable shader to set bone transform matrices
             rlSetUniformMatrices(mat.shader.locs[SHADER_LOC_MATRIX_BONETRANSFORMS], model.boneMatrices, model.skeleton.boneCount);

Original file line number	Diff line number	Diff line change
`@@ -3446,7 +3446,7 @@ static inline bool sw_is_texture_valid(uint32_t id)`
`3446`	`3446`	`else if (id >= SW_MAX_TEXTURES) valid = false;`
`3447`	`3447`	`else if (RLSW.loadedTextures[id].pixels == NULL) valid = false;`
`3448`	`3448`
`3449`		`- return true;`
	`3449`	`+ return valid;`
`3450`	`3450`	`}`
`3451`	`3451`
`3452`	`3452`	`static inline bool sw_is_texture_filter_valid(int filter)`
Original file line number	Diff line number	Diff line change
`@@ -3928,7 +3928,7 @@ void DrawModelEx(Model model, Vector3 position, Vector3 rotationAxis, float rota`
`3928`	`3928`
`3929`	`3929`	`// Upload runtime bone transforms matrices, to compute skinning on the shader (GPU-skinning)`
`3930`	`3930`	`// NOTE: Required location must be found and Mesh bones indices and weights must be also uploaded to shader`
`3931`		`- if ((mat.shader.locs[SHADER_LOC_MATRIX_BONETRANSFORMS] != -1) && (model.boneMatrices != NULL))`
	`3931`	`+ if (mat.shader.locs != NULL && (mat.shader.locs[SHADER_LOC_MATRIX_BONETRANSFORMS] != -1) && (model.boneMatrices != NULL))`
`3932`	`3932`	`{`
`3933`	`3933`	`rlEnableShader(mat.shader.id); // Enable shader to set bone transform matrices`
`3934`	`3934`	`rlSetUniformMatrices(mat.shader.locs[SHADER_LOC_MATRIX_BONETRANSFORMS], model.boneMatrices, model.skeleton.boneCount);`