@@ -1,6 +1,15 @@
-10.7.x.x (relative to 10.7.1.1)
+10.7.x.x (relative to 10.7.1.2)
 ========
 
+
+10.7.1.2 (relative to 10.7.1.1)
+========
+
+Fixes
+-----
+
+- IECore.ls() : Fixed error when sequence started with `#`.
+
 10.7.1.1 (relative to 10.7.1.0)
 ========
 
 
@@ -54,7 +54,7 @@ SConsignFile()
 ieCoreMilestoneVersion = 10 # for announcing major milestones - may contain all of the below
 ieCoreMajorVersion = 7 # backwards-incompatible changes
 ieCoreMinorVersion = 1 # new backwards-compatible features
-ieCorePatchVersion = 1 # bug fixes
+ieCorePatchVersion = 2 # bug fixes
 ieCoreVersionSuffix = "" # used for alpha/beta releases. Example: "a1", "b2", etc.
 
 ###########################################################################################
 
@@ -243,7 +243,7 @@ void IECore::ls( const std::string &sequencePath, FileSequencePtr &sequence, siz
 	{
 		const std::string fileName = it->path().PATH_TO_STRING;
 
-		if ( fileName.size() >= std::min( prefix.size(), suffix.size() ) && fileName.substr( 0, prefix.size() ) == prefix && fileName.substr( fileName.size() - suffix.size(), suffix.size() ) == suffix )
+		if ( fileName.size() >= prefix.size() + suffix.size() && fileName.substr( 0, prefix.size() ) == prefix && fileName.substr( fileName.size() - suffix.size(), suffix.size() ) == suffix )
 		{
 			files.push_back( ( dir / boost::filesystem::path( fileName ) ).string() );
 		}
 
@@ -465,6 +465,28 @@ def testAmbiguousPaddingNonContiguous( self ):
 		l = IECore.ls( os.path.join( "test", "sequences", "lsTest", "a.###.tif" ) )
 		self.assertFalse( l )
 
+	def testShortFileInDirectory( self ) :
+
+		"""A directory entry shorter than the sequence's suffix must not cause a
+		crash (unsigned underflow in substr) when ls() scans the directory."""
+
+		self.tearDown()
+		os.makedirs( os.path.join( "test", "sequences", "lsTest" ) )
+
+		# A sequence with an empty prefix (section before #) and a long suffix (section after)
+		s = IECore.FileSequence( os.path.join( "test", "sequences", "lsTest", "#_a_very_long_filename.ext" ), IECore.FrameRange( 1, 1 ) )
+		for f in s.fileNames() :
+			self.touch( f )
+
+		# A file whose name is shorter than the sequence's suffix in the same directory.
+		# Previously this triggered:
+		# IndexError: basic_string::substr: __pos (which is 18446744073709551582) > this->size() (which is 4)
+		self.touch( os.path.join( "test", "sequences", "lsTest", "a.b" ) )
+
+		l = IECore.ls( s.fileName, minSequenceSize=1 )
+		self.assertTrue( l )
+		self.assertEqual( l.frameList.asList(), [ 1 ] )
+
 	def tearDown( self ) :
 
 		if os.path.exists( os.path.join( "test", "sequences" ) ) :
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ void IECore::ls( const std::string &sequencePath, FileSequencePtr &sequence, siz`
`243`	`243`	`{`
`244`	`244`	`const std::string fileName = it->path().PATH_TO_STRING;`
`245`	`245`
`246`		`- if ( fileName.size() >= std::min( prefix.size(), suffix.size() ) && fileName.substr( 0, prefix.size() ) == prefix && fileName.substr( fileName.size() - suffix.size(), suffix.size() ) == suffix )`
	`246`	`+ if ( fileName.size() >= prefix.size() + suffix.size() && fileName.substr( 0, prefix.size() ) == prefix && fileName.substr( fileName.size() - suffix.size(), suffix.size() ) == suffix )`
`247`	`247`	`{`
`248`	`248`	`files.push_back( ( dir / boost::filesystem::path( fileName ) ).string() );`
`249`	`249`	`}`