Module Name:    src
Committed By:   plunky
Date:           Thu Sep  3 20:43:47 UTC 2015

Modified Files:
        src/include/ssp: ssp.h

Log Message:
correct __ssp_overlap() to not trigger for adjacent areas


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/include/ssp/ssp.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/include/ssp/ssp.h
diff -u src/include/ssp/ssp.h:1.12 src/include/ssp/ssp.h:1.13
--- src/include/ssp/ssp.h:1.12	Thu Jun 25 18:41:03 2015
+++ src/include/ssp/ssp.h	Thu Sep  3 20:43:47 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssp.h,v 1.12 2015/06/25 18:41:03 joerg Exp $	*/
+/*	$NetBSD: ssp.h,v 1.13 2015/09/03 20:43:47 plunky Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2011 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@ __ssp_inline rtype fun args { \
     __ssp_redirect_raw(rtype, fun, fun, args, call, 1, __ssp_bos0)
 
 #define __ssp_overlap(a, b, l) \
-    (((a) <= (b) && (b) <= (a) + (l)) || ((b) <= (a) && (a) <= (b) + (l)))
+    (((a) <= (b) && (b) < (a) + (l)) || ((b) <= (a) && (a) < (b) + (l)))
 
 __BEGIN_DECLS
 void __stack_chk_fail(void) __dead;

Reply via email to