Skip file if no valid filename could be retrieved most probably due to Charset mismatches, this is is more a last resort: probably a lossy conversion should be attempted before

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@40397 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rmottola 2017-03-17 14:11:14 +00:00
parent ed6afee942
commit 632a4e12f0
2 changed files with 11 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2017-03-17 Riccardo Mottola <rm@gnu.org>
* Source/NSFileManager.m:(nextObject of Enumerator)
Skip file if no valid filename could be retrieved most probably due to Charset mismatches, this is is more a last resort: probably a lossy conversion should be attempted before.
2017-03-17 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSTimeZones/NSTimeZones.tar: Updated with latest information.

View file

@ -1,7 +1,7 @@
/**
/**
NSFileManager.m
Copyright (C) 1997-2015 Free Software Foundation, Inc.
Copyright (C) 1997-2017 Free Software Foundation, Inc.
Author: Mircea Oancea <mircea@jupiter.elcom.pub.ro>
Author: Ovidiu Predescu <ovidiu@net-community.com>
@ -2505,6 +2505,10 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
stringWithFileSystemRepresentation: dirbuf->d_name
length: strlen(dirbuf->d_name)];
#endif
/* if we have a null FileName something went wrong (charset?) and we skip it */
if (returnFileName == nil)
continue;
returnFileName = RETAIN([dir.path stringByAppendingPathComponent:
returnFileName]);