[Bf-blender-cvs] [06212759bc7] master: Fix missing NULL check on macOS when system-python isn't found

[Campbell Barton]

Commit: 06212759bc7285a131c3ee811aec1ee240841c2c
Author: Campbell Barton
Date:   Mon Feb 22 21:20:48 2021 +1100
Branches: master
https://developer.blender.org/rB06212759bc7285a131c3ee811aec1ee240841c2c

Fix missing NULL check on macOS when system-python isn't found

Regression from cafd6b519c5f5c4b67d0dfe3d453cd4223b38716.

D10494 by @ysano with edits.

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

M	source/blender/python/intern/bpy_interface.c

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

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 9fea65935e1..c5f5e9c71b8 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -419,16 +419,19 @@ void BPY_python_start(bContext *C, int argc, const char **argv)
     /* Allow to use our own included Python. `py_path_bundle` may be NULL. */
     {
       const char *py_path_bundle = BKE_appdir_folder_id(BLENDER_SYSTEM_PYTHON, NULL);
-#  ifdef __APPLE__
-      /* OSX allow file/directory names to contain : character (represented as / in the Finder)
-       * but current Python lib (release 3.1.1) doesn't handle these correctly */
-      if (strchr(py_path_bundle, ':')) {
-        fprintf(stderr,
-                "Warning! Blender application is located in a path containing ':' or '/' chars\n"
-                "This may make python import function fail\n");
-      }
-#  endif
       if (py_path_bundle != NULL) {
+
+#  ifdef __APPLE__
+        /* Mac-OS allows file/directory names to contain `:` character
+         * (represented as `/` in the Finder) but current Python lib (as of release 3.1.1)
+         * doesn't handle these correctly. */
+        if (strchr(py_path_bundle, ':')) {
+          fprintf(stderr,
+                  "Warning! Blender application is located in a path containing ':' or '/' chars\n"
+                  "This may make python import function fail\n");
+        }
+#  endif /* __APPLE__ */
+
         status = PyConfig_SetBytesString(&config, &config.home, py_path_bundle);
         pystatus_exit_on_error(status);
       }