Changeset 222 for trunk/Cocoa

Timestamp:

05/16/06 18:44:19 (19 years ago)

Author:

rchin

Message:

Fixed problem with F-Script leaking file handles (caused F-Script to not be able to inject into applications after a certain number of running apps had been launched). The problem was in appIsPEF calling open(2) but not close(2) before returning.

Location:

trunk/Cocoa/F-Script Anywhere/Source

Files:

• Bundle Loader-Info.plist (modified) (1 diff)
• Bundle-Info.plist (modified) (1 diff)
• DeVercruesseProcess.m (modified) (1 diff)
• English.lproj/InfoPlist.strings (modified) ( previous)
• FSAApp.mm (modified) (1 diff)
• FSAAppList.m (modified) (5 diffs)
• Info-Application.plist (modified) (2 diffs)
• VERSION (modified) (1 diff)

trunk/Cocoa/F-Script Anywhere/Source/Bundle Loader-Info.plist

@@ -22 +22 @@
         <string>FSAL</string>
         <key>CFBundleVersion</key>
-        <string>1.2b1</string>
+        <string>1.3</string>
 </dict>
 </plist>

trunk/Cocoa/F-Script Anywhere/Source/Bundle-Info.plist

@@ -22 +22 @@
         <string>FSAB</string>
         <key>CFBundleVersion</key>
-        <string>1.2b1</string>
+        <string>1.3</string>
 </dict>
 </plist>

trunk/Cocoa/F-Script Anywhere/Source/DeVercruesseProcess.m

@@ -111 +111 @@
     bundleURL = CFURLCreateWithFileSystemPath(NULL, bundleLoc, kCFURLPOSIXPathStyle, NO);
     bundleRef = CFBundleCreate(NULL, bundleURL);
+    CFRelease(bundleURL);
 
     if (bundleRef == NULL) {
         BOOL isDir;
-        CFRelease(bundleURL);
         if ([[NSFileManager defaultManager] fileExistsAtPath: [self loc] isDirectory: &isDir] && !isDir)
             return [self loc];

trunk/Cocoa/F-Script Anywhere/Source/FSAApp.mm

@@ -239 +239 @@
     if (err != noErr)
         [self installationError: err inAppWithPID: pid];
+    else
+        [appList didPatchProcessID: pid];
 }
 

trunk/Cocoa/F-Script Anywhere/Source/FSAAppList.m

@@ -132 +132 @@
 {
     [tableView reloadData];
-    [self tableView: tableView shouldSelectRow: [tableView selectedRow]];
+//    [self tableView: tableView shouldSelectRow: [tableView selectedRow]];
 }
 
@@ -143 +143 @@
 {
     DeVercruesseProcess *app = [self _applicationForPID: pid];
-    [patchingApps removeObject: app];
-    [patchedApps addObject: app];
+    if(app){
+        [patchingApps removeObject: app];
+        [patchedApps addObject: app];
+    }
     [self _processStatusChanged];
 }
@@ -170 +172 @@
         return NO;
     
-    if (read(fd, &pefHeader, sizeof(pefHeader)) != sizeof(pefHeader))
+    if (read(fd, &pefHeader, sizeof(pefHeader)) != sizeof(pefHeader)){
+        close(fd);
         return NO;
+    } else
+        close(fd);
     
     if (pefHeader.tag1 != kPEFTag1 || pefHeader.tag2 != kPEFTag2)
@@ -229 +234 @@
      }
      */
-    
     if ( ![app isBackgroundOnly] &&
          ( ( [app isCocoa] && ![self appIsPEF: app]) ||
@@ -461 +465 @@
     id e = [cocoaApps objectEnumerator];
     while(anApp = [e nextObject]){
-        if([alwaysApps containsObject:[anApp name]] && ![patchedApps containsObject:anApp]){
+        if([alwaysApps containsObject:[anApp name]]){
             [NSApp installBundleInAppWithPID:[anApp pid]];
         }

trunk/Cocoa/F-Script Anywhere/Source/Info-Application.plist

@@ -8 +8 @@
         <string>F-Script Anywhere</string>
         <key>CFBundleGetInfoString</key>
-        <string>F-Script Anywhere 1.2b1,
-© 2002–04 Nicholas Riley</string>
+        <string>F-Script Anywhere 1.3,
+© 2002–06 Nicholas Riley</string>
         <key>CFBundleIconFile</key>
         <string>Application icon</string>
@@ -21 +21 @@
         <string>APPL</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.2b1</string>
+        <string>1.3</string>
         <key>CFBundleSignature</key>
         <string>FSAn</string>
         <key>CFBundleVersion</key>
-        <string>1.2b1</string>
+        <string>1.3</string>
         <key>NSMainNibFile</key>
         <string>MainMenu</string>

trunk/Cocoa/F-Script Anywhere/Source/VERSION

@@ -1 @@
-1.1.6d1
+1.3