mlt_factory.c: guard against accessing mlt_environment before it is ready

[melted] / src / framework / mlt_profile.c

diff --git a/src/framework/mlt_profile.c b/src/framework/mlt_profile.c
index 778bb53..960550e 100644 (file)
--- a/src/framework/mlt_profile.c
+++ b/src/framework/mlt_profile.c
@@ -89,9 +89,9 @@ mlt_profile mlt_profile_init( const char *name )
        {
                // MLT_PROFILE is preferred environment variable
                if ( getenv( "MLT_PROFILE" ) )
-                       profile = mlt_profile_select( mlt_environment( "MLT_PROFILE" ) );
+                       profile = mlt_profile_select( getenv( "MLT_PROFILE" ) );
                // MLT_NORMALISATION backwards compatibility
-               else if ( strcmp( mlt_environment( "MLT_NORMALISATION" ), "PAL" ) )
+               else if ( getenv( "MLT_NORMALISATION" ) && strcmp( getenv( "MLT_NORMALISATION" ), "PAL" ) )
                        profile = mlt_profile_select( "dv_ntsc" );
                else
                        profile = mlt_profile_select( "dv_pal" );
@@ -145,19 +145,21 @@ mlt_profile mlt_profile_load_file( const char *file )
 
        // Set MLT_NORMALISATION to appease legacy modules
        char *profile_name = mlt_environment( "MLT_PROFILE" );
-       if ( strstr( profile_name, "_ntsc" ) ||
-            strstr( profile_name, "_60" ) ||
-            strstr( profile_name, "_30" ) )
+       if ( profile_name )
        {
-               mlt_environment_set( "MLT_NORMALISATION", "NTSC" );
-       }
-       else if ( strstr( profile_name, "_pal" ) ||
-                 strstr( profile_name, "_50" ) ||
-                 strstr( profile_name, "_25" ) )
-       {
-               mlt_environment_set( "MLT_NORMALISATION", "PAL" );
+               if ( strstr( profile_name, "_ntsc" ) ||
+                       strstr( profile_name, "_60" ) ||
+                       strstr( profile_name, "_30" ) )
+               {
+                       mlt_environment_set( "MLT_NORMALISATION", "NTSC" );
+               }
+               else if ( strstr( profile_name, "_pal" ) ||
+                               strstr( profile_name, "_50" ) ||
+                               strstr( profile_name, "_25" ) )
+               {
+                       mlt_environment_set( "MLT_NORMALISATION", "PAL" );
+               }
        }
-
        return profile;
 }