readBin() now returns -1 instead of garbage when attempting to read past the

end-of-file.

src/sbbs3/js_file.c

@@ -274,7 +274,7 @@ js_readbin(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	size_t		size=sizeof(DWORD);
 	private_t*	p;
 
-	*rval = JSVAL_NULL;
+	*rval = JSVAL_TO_INT(-1);
 
 	if((p=(private_t*)JS_GetPrivate(cx,obj))==NULL)
 		return(JS_FALSE);
@@ -287,15 +287,15 @@ js_readbin(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 
 	switch(size) {
 		case sizeof(BYTE):
-			fread(&b,1,size,p->fp);
+			if(fread(&b,1,size,p->fp)==size)
 				*rval = INT_TO_JSVAL(b);
 			break;
 		case sizeof(WORD):
-			fread(&w,1,size,p->fp);
+			if(fread(&w,1,size,p->fp)==size)
 				*rval = INT_TO_JSVAL(w);
 			break;
 		case sizeof(DWORD):
-			fread(&l,1,size,p->fp);
+			if(fread(&l,1,size,p->fp)==size)
 				*rval = INT_TO_JSVAL(l);
 			break;
 	}