[sword-svn] r3182 - in branches/sword-1-7-x: . src/modules/common

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-04-16 21:28:36 -0700 (Wed, 16 Apr 2014)
New Revision: 3182

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/src/modules/common/rawverse4.cpp
Log:
Merging r3135 - proper error detection on read



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3134
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135

Modified: branches/sword-1-7-x/src/modules/common/rawverse4.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/common/rawverse4.cpp	2014-04-17 04:27:57 UTC (rev 3181)
+++ branches/sword-1-7-x/src/modules/common/rawverse4.cpp	2014-04-17 04:28:36 UTC (rev 3182)
@@ -131,7 +131,7 @@
 		*start = swordtoarch32(tmpStart);
 		*size  = swordtoarch32(tmpSize);
 
-		if (len < 2) {
+		if (len < 4) {
 			*size = (unsigned long)((*start) ? (textfp[testmt-1]->seek(0, SEEK_END) - (long)*start) : 0);	// if for some reason we get an error reading size, make size to end of file
 		}
 	}