Ticket #3072: Modifiable_web_dirv2.patch

platform.c

@@ -544 +544 @@
         else
         {
 
-#ifdef SYS_DARWIN /* on Mac, look in the app package first, then the Application Support folder (for daemon, etc) */
+#ifdef SYS_DARWIN /* on Mac, look in the Application Support folder first, then in the app bundle. */
+            char * appString;
+            tr_bool success;
 
             CFURLRef appURL = CFBundleCopyBundleURL( CFBundleGetMainBundle( ) );
             CFStringRef appRef = CFURLCopyFileSystemPath( appURL,
-                                                         kCFURLPOSIXPathStyle );
-            const char * appString = CFStringGetCStringPtr( appRef,
-                                         CFStringGetFastestEncoding( appRef ) );
+                                                          kCFURLPOSIXPathStyle );
+            CFIndex appLength = CFStringGetMaximumSizeForEncoding( CFStringGetLength(appRef),
+                                                                   CFStringGetFastestEncoding( appRef ));
+
+            appString = tr_malloc( appLength + 1 );
+            success = CFStringGetCString( appRef,
+                                          appString,
+                                          appLength + 1,
+                                          CFStringGetFastestEncoding( appRef ));
+            assert( success );
+
             CFRelease( appURL );
             CFRelease( appRef );
 
-            s = tr_buildPath( appString, "Contents", "Resources", "web", NULL );
+            /* Look in the Application Support folder */
+            s = tr_buildPath( tr_sessionGetConfigDir( session ), "web", NULL );
 
             if( !isWebClientDir( s ) ) {
                 tr_free( s );
 
-                /* Fallback to the Application Support folder */
-                s = tr_buildPath( tr_sessionGetConfigDir( session ), "web", NULL );
+                /* Fallback to the app bundle */
+                s = tr_buildPath( appString, "Contents", "Resources", "web", NULL );
                 if( !isWebClientDir( s ) ) {
                     tr_free( s );
                     s = NULL;
                 }
             }
+            tr_free( appString );
 
 #elif defined( WIN32 )