From a947529954d9db0214e65d2c856111f823381f7c Mon Sep 17 00:00:00 2001
From: Victor van den Elzen <victor.vde@gmail.com>
Date: Wed, 10 Mar 2010 23:18:21 +0100
Subject: [PATCH 1/4] NASM 2.08.01

---
 version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version b/version
index 9e33c656..f833bcca 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.08
+2.08.01

From 7d96ac6a567df5075e3f4f4019d6d24727db8361 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sat, 10 Jul 2010 02:11:41 +0400
Subject: [PATCH 2/4] preproc.c: Fix NULL deref on token pasting

In case if there is a whitespace before
'paste' token we may reach NULL dereference
in strlen since paste_head will point to
TOK_WHITESPACE. Fix it.

[mainstream adabc1576b957fc7d929d2c7e749b4f45f7293aa]

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 preproc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/preproc.c b/preproc.c
index 1af58d92..3c358284 100644
--- a/preproc.c
+++ b/preproc.c
@@ -3594,7 +3594,9 @@ static bool paste_tokens(Token **head, bool handle_paste_tokens)
             }
             /* else fall through */
         default:
-            tail = paste_head = &t->next;
+            tail = &t->next;
+            if (!tok_type_(t->next, TOK_WHITESPACE))
+                paste_head = tail;
             break;
         }
     }

From 5483d495a73d3127d5eea6c06c36f03ed3bc4c4f Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sat, 10 Jul 2010 02:37:49 +0400
Subject: [PATCH 3/4] NASM 2.08.02

---
 version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version b/version
index f833bcca..95aa84f1 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.08.01
+2.08.02

From 5bc03271bda121a7f37c9a7fddd9b820d41a1456 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Thu, 15 Jul 2010 22:44:03 -0700
Subject: [PATCH 4/4] changes.src: update with the 2.08.xx changes

Patchlevels should be documented, too...

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 doc/changes.src | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/changes.src b/doc/changes.src
index 1d98a076..65d10c04 100644
--- a/doc/changes.src
+++ b/doc/changes.src
@@ -8,6 +8,16 @@ The NASM 2 series support x86-64, and is the production version of NASM
 since 2007.
 
 
+\S{cl-2.08.02} Version 2.08.02
+
+\b Fix crash under certain circumstances when using the \c{%+} operator.
+
+
+\S{cl-2.08.01} Version 2.08.01
+
+\b Fix the \c{%use} statement, which was broken in 2.08.
+
+
 \S{cl-2.08} Version 2.08
 
 \b A number of enhancements/fixes in macros area.