===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/file/magic-test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/file/magic-test.c	2015/08/12 09:39:43	1.13
--- src/usr.bin/file/magic-test.c	2015/10/05 19:50:38	1.14
***************
*** 1,4 ****
! /* $OpenBSD: magic-test.c,v 1.13 2015/08/12 09:39:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
--- 1,4 ----
! /* $OpenBSD: magic-test.c,v 1.14 2015/10/05 19:50:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
***************
*** 1135,1141 ****
  	else {
  		wanted = ml->indirect_offset;
  		if (ml->indirect_relative) {
! 			if (wanted < 0 && -wanted > ms->offset)
  				return (0);
  			if (wanted > 0 && ms->offset + wanted > ms->size)
  				return (0);
--- 1135,1141 ----
  	else {
  		wanted = ml->indirect_offset;
  		if (ml->indirect_relative) {
! 			if (wanted < 0 && (size_t)-wanted > ms->offset)
  				return (0);
  			if (wanted > 0 && ms->offset + wanted > ms->size)
  				return (0);
***************
*** 1186,1199 ****
  	}
  
  	if (ml->offset_relative) {
! 		if (wanted < 0 && -wanted > ms->offset)
  			return (0);
  		if (wanted > 0 && ms->offset + wanted > ms->size)
  			return (0);
  		offset = ms->offset + wanted;
  	} else
  		offset = wanted;
! 	if (offset < 0 || offset > ms->size)
  		return (0);
  	ms->offset = offset;
  
--- 1186,1199 ----
  	}
  
  	if (ml->offset_relative) {
! 		if (wanted < 0 && (size_t)-wanted > ms->offset)
  			return (0);
  		if (wanted > 0 && ms->offset + wanted > ms->size)
  			return (0);
  		offset = ms->offset + wanted;
  	} else
  		offset = wanted;
! 	if (offset < 0 || (size_t)offset > ms->size)
  		return (0);
  	ms->offset = offset;
  
***************
*** 1213,1219 ****
  	if (ml->mimetype != NULL)
  		ms->mimetype = ml->mimetype;
  
! 	magic_warn(ml, "test %s/%c matched at offset %llu: '%s'",
  	    ml->type_string, ml->test_operator, ms->offset,
  	    ml->result == NULL ? "" : ml->result);
  
--- 1213,1219 ----
  	if (ml->mimetype != NULL)
  		ms->mimetype = ml->mimetype;
  
! 	magic_warn(ml, "test %s/%c matched at offset %zu: '%s'",
  	    ml->type_string, ml->test_operator, ms->offset,
  	    ml->result == NULL ? "" : ml->result);