github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid crash in PathWatcher when renaming to a null path

Browse Source 
I added some logging for the time being, because this seems weird, but at least it doesn't crash anymore.
This commit is contained in:
Nathan Sobo
2012-10-25 14:20:49 -06:00
parent d310297fe7
commit edf7f6611f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
native/path_watcher.mm
View File

@@ -248,6 +248,9 @@ static NSMutableArray *gPathWatchers;
char pathBuffer[MAXPATHLEN];
fcntl((int)event.ident, F_GETPATH, &pathBuffer);
newPath = [NSString stringWithUTF8String:pathBuffer];
if (!newPath) {
NSLog(@"WARNING: Renamed %@ to a null path", path);
}
}
NSDictionary *callbacks;
@@ -263,7 +266,11 @@ static NSMutableArray *gPathWatchers;
});
if (event.fflags & NOTE_RENAME) {
[self reassignFileDescriptor:fdNumber from:path to:newPath];
if (newPath) {
[self reassignFileDescriptor:fdNumber from:path to:newPath];
} else {
NSLog(@"WARNING: Reassigning file descriptor from path %@ to null path", path);
}
}
}
}