# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1643983505 -3600
# Node ID 38b8a25223270afe15ec9a7793de97f5784cea8c
# Parent  370da83187abf008e5183a99f41f9a476a9156f8
aspell: apply patch CVE-2019-25051

diff -r 370da83187ab -r 38b8a2522327 aspell/description.txt
--- a/aspell/description.txt	Fri Feb 04 09:24:50 2022 +0000
+++ b/aspell/description.txt	Fri Feb 04 15:05:05 2022 +0100
@@ -1,4 +1,5 @@
-GNU Aspell is a Free and Open Source spell checker. It can either be used as a 
-library or as an independent spell checker. Its main feature is that it does a 
-superior job of suggesting possible replacements for a misspelled word than just
-about any other spell checker out there for the English language.
+GNU Aspell is a Free and Open Source spell checker.
+It can either be used as a library or as an independent spell checker.
+Its main feature is that it does a superior job of suggesting possible
+replacements for a misspelled word than just about any other spell
+checker out there for the English language.
diff -r 370da83187ab -r 38b8a2522327 aspell/receipt
--- a/aspell/receipt	Fri Feb 04 09:24:50 2022 +0000
+++ b/aspell/receipt	Fri Feb 04 15:05:05 2022 +0100
@@ -27,8 +27,10 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	export LDFLAGS="$LDFLAGS -ltinfo"
-	./configure $CONFIGURE_ARGS &&
+	patch --strip=1 --input=$stuff/patches/CVE-2019-25051 &&
+	./configure				\
+		LDFLAGS="$LDFLAGS -ltinfo"	\
+		$CONFIGURE_ARGS &&
 	make &&
 	make install
 }
diff -r 370da83187ab -r 38b8a2522327 aspell/stuff/patches/CVE-2019-25051
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/aspell/stuff/patches/CVE-2019-25051	Fri Feb 04 15:05:05 2022 +0100
@@ -0,0 +1,96 @@
+From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001
+From: Kevin Atkinson <kevina@gnu.org>
+Date: Sat, 21 Dec 2019 20:32:47 +0000
+Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk
+ to prevent a buffer overflow
+
+Bug found using OSS-Fuze.
+---
+ common/objstack.hpp | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/common/objstack.hpp b/common/objstack.hpp
+index 3997bf7..bd97ccd 100644
+--- a/common/objstack.hpp
++++ b/common/objstack.hpp
+@@ -5,6 +5,7 @@
+ #include "parm_string.hpp"
+ #include <stdlib.h>
+ #include <assert.h>
++#include <stddef.h>
+ 
+ namespace acommon {
+ 
+@@ -26,6 +27,12 @@ class ObjStack
+   byte * temp_end;
+   void setup_chunk();
+   void new_chunk();
++  bool will_overflow(size_t sz) const {
++    return offsetof(Node,data) + sz > chunk_size;
++  }
++  void check_size(size_t sz) {
++    assert(!will_overflow(sz));
++  }
+ 
+   ObjStack(const ObjStack &);
+   void operator=(const ObjStack &);
+@@ -56,7 +63,7 @@ class ObjStack
+   void * alloc_bottom(size_t size)  {
+     byte * tmp = bottom;
+     bottom += size;
+-    if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;}
++    if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;}
+     return tmp;
+   }
+   // This alloc_bottom will insure that the object is aligned based on the
+@@ -66,7 +73,7 @@ class ObjStack
+     align_bottom(align);
+     byte * tmp = bottom;
+     bottom += size;
+-    if (bottom > top) {new_chunk(); goto loop;}
++    if (bottom > top) {check_size(size); new_chunk(); goto loop;}
+     return tmp;
+   }
+   char * dup_bottom(ParmString str) {
+@@ -79,7 +86,7 @@ class ObjStack
+   // always be aligned as such.
+   void * alloc_top(size_t size) {
+     top -= size;
+-    if (top < bottom) {new_chunk(); top -= size;}
++    if (top < bottom) {check_size(size); new_chunk(); top -= size;}
+     return top;
+   }
+   // This alloc_top will insure that the object is aligned based on
+@@ -88,7 +95,7 @@ class ObjStack
+   {loop:
+     top -= size;
+     align_top(align);
+-    if (top < bottom) {new_chunk(); goto loop;}
++    if (top < bottom) {check_size(size); new_chunk(); goto loop;}
+     return top;
+   }
+   char * dup_top(ParmString str) {
+@@ -117,6 +124,7 @@ class ObjStack
+   void * alloc_temp(size_t size) {
+     temp_end = bottom + size;
+     if (temp_end > top) {
++      check_size(size);
+       new_chunk();
+       temp_end = bottom + size;
+     }
+@@ -131,6 +139,7 @@ class ObjStack
+     } else {
+       size_t s = temp_end - bottom;
+       byte * p = bottom;
++      check_size(size);
+       new_chunk();
+       memcpy(bottom, p, s);
+       temp_end = bottom + size;
+@@ -150,6 +159,7 @@ class ObjStack
+     } else {
+       size_t s = temp_end - bottom;
+       byte * p = bottom;
++      check_size(size);
+       new_chunk();
+       memcpy(bottom, p, s);
+       temp_end = bottom + size;