===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/file/magic-test.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/file/magic-test.c	2016/05/01 10:56:03	1.22
--- src/usr.bin/file/magic-test.c	2016/05/01 11:26:19	1.23
***************
*** 1,4 ****
! /* $OpenBSD: magic-test.c,v 1.22 2016/05/01 10:56:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
--- 1,4 ----
! /* $OpenBSD: magic-test.c,v 1.23 2016/05/01 11:26:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
***************
*** 733,739 ****
  	if (ms->size - ms->offset < 1)
  		return (-1);
  	slen = *(u_char *)s;
! 	if (slen > ms->size - ms->offset)
  		return (-1);
  	s++;
  
--- 733,739 ----
  	if (ms->size - ms->offset < 1)
  		return (-1);
  	slen = *(u_char *)s;
! 	if (slen + 1 > ms->size - ms->offset)
  		return (-1);
  	s++;