From: Fredrik Lundh <fredrik@pythonware.com>
Date: Fri, 30 Jun 2000 21:40:20 +0000 (+0000)
Subject: -- changed $ to match before a trailing newline, even
X-Git-Tag: v2.0b1~1184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef34bd2c0d00d2ef23bcffaf21b169342729a26b;p=thirdparty%2FPython%2Fcpython.git

-- changed $ to match before a trailing newline, even
   if the multiline flag isn't given.
---

diff --git a/Modules/_sre.c b/Modules/_sre.c
index 268c5dd82b9c..46fe4ed67952 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -310,7 +310,9 @@ SRE_AT(SRE_STATE* state, SRE_CHAR* ptr, SRE_CODE at)
                 SRE_IS_LINEBREAK((int) ptr[-1]));
 
 	case SRE_AT_END:
-		return ((void*) ptr == state->end);
+        return (((void*) (ptr+1) == state->end &&
+                 SRE_IS_LINEBREAK((int) ptr[0])) ||
+                ((void*) ptr == state->end));
 
 	case SRE_AT_END_LINE:
 		return ((void*) ptr == state->end ||