Check for errors during string to integer conversion in various places

darcs-hash:20070109032005-ac50b-29514c9c8c19c70b7cfe7670a5c74899f316931f.gz

1 files changed, 17 insertions, 3 deletions

diff --git a/util.c b/util.c
index f6de95ca..e709ce4d 100644
--- a/util.c
+++ b/util.c
@@ -1112,9 +1112,23 @@ int wcsfilecmp( const wchar_t *a, const wchar_t *b )
 	if( iswdigit( *a ) && iswdigit( *b ) )
 	{
 		wchar_t *aend, *bend;
-		long al = wcstol( a, &aend, 10 );
-		long bl = wcstol( b, &bend, 10 );
-		int diff = al - bl;
+		long al;
+		long bl;
+		int diff;
+
+		errno = 0;		
+		al = wcstol( a, &aend, 10 );
+		bl = wcstol( b, &bend, 10 );
+
+		if( errno )
+		{
+			/*
+			  Huuuuuuuuge numbers - fall back to regular string comparison
+			*/
+			return wcscmp( a, b );
+		}
+		
+		diff = al - bl;
 		if( diff )
 			return diff>0?2:-2;