From 07dff056822c0b7d7313d9d08fd16ba8d4ebe357 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Thu, 15 Aug 2019 16:55:56 +0300
Subject: [PATCH] fix / update changelog entries.

---
 WhatsNew  |  7 ++++---
 docs.html | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WhatsNew b/WhatsNew
index 56b0bde2d..ba8487b80 100644
--- a/WhatsNew
+++ b/WhatsNew
@@ -10,13 +10,14 @@ Changes include:
   CVE-2019-7577, CVE-2019-7578 -- bugs 4490, 4491, 4492, 4493, 4494,
   4495, 4496, and 4522.)
 - Video, bmp loader:  security fixes for CVE-2019-7635, CVE-2019-7636,
-  CVE-2019-7637, CVE-2019-7638, CVE-2019-13616 (bugs 4498, 4499, 4500,
-  4517, and 4538.)
+  CVE-2019-7638, CVE-2019-13616 (bugs 4498, 4499, 4500, 4517 and 4538.)
 - Video, blit: fix handling of alpha channel in Altivec accelerated
   blit functions (bug 1424.)
 - Video, blit: use fast path for RGB 565 -> 32-bit XRGB 8888
 - Video, blit: fix RGBA<->RGBA blit broken with the optimization from
   bug 11 (bug 2976.)
+- Video: fix integer overflow in SDL_CalculatePitch (CVE-2019-7637,
+  bug 4497.)
 - Mouse: fix SDL_ResetMouse() using a bogus mouse button causing a
   negative shift (bug 3593.)
 - Cdrom: fix SDL_CDResume() and SDL_CDStop() not returning failure
@@ -30,7 +31,7 @@ Changes include:
 - OpenBSD: fix dynamic loading of X libs (bug 1434.)
 - X11video: fix missing symbol X11_KeyToUnicode in .so file (bug 1390.
   not being an official SDL function, the use of X11_KeyToUnicode() is
-  discouraged.)
+  strongly discouraged.)
 - X11video: fix compilation with libX11 >= 1.5.99.902 (bug 1769.)
 - X11video: fix for XChangeProperty() crash (bug 1427.)
 - X11video: fix SDL_EnableUNICODE sometimes dropping keyboard events
diff --git a/docs.html b/docs.html
index 724c98769..5230b95d1 100644
--- a/docs.html
+++ b/docs.html
@@ -30,8 +30,8 @@ <H2> SDL 1.2.16 Release Notes </H2>
 </P>
 <P>
   Video, bmp loader:  security fixes for CVE-2019-7635, CVE-2019-7636,
-  CVE-2019-7637, CVE-2019-7638, CVE-2019-13616 (bugs <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4498">4498</a>, <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4499">4499</a>, <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4500">4500</a>,
-  <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4517">4517</a>, and <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4538">4538</a>.)
+  CVE-2019-7638, CVE-2019-13616 (bugs <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4498">4498</a>, <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4499">4499</a>, <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4500">4500</a>,
+  <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4517">4517</a> and <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4538">4538</a>.)
 </P>
 <P>
   Video, blit: fix handling of alpha channel in Altivec accelerated
@@ -44,6 +44,10 @@ <H2> SDL 1.2.16 Release Notes </H2>
   Video, blit: fix RGBA<->RGBA blit broken with the optimization from
   <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=11">bug 11</a> (bug <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=2976">2976</a>.)
 </P>
+<P>
+  Video: fix integer overflow in SDL_CalculatePitch (CVE-2019-7637,
+  bug <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4497">4497</a>.)
+</P>
 <P>
   Mouse: fix SDL_ResetMouse() using a bogus mouse button causing a
   negative shift (bug <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=3593">3593</a>.)
@@ -74,7 +78,7 @@ <H2> SDL 1.2.16 Release Notes </H2>
 <P>
   X11video: fix missing symbol X11_KeyToUnicode in .so file (bug <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=1390">1390</a>.
   not being an official SDL function, the use of X11_KeyToUnicode() is
-  discouraged.)
+  strongly discouraged.)
 </P>
 <P>
   X11video: fix compilation with libX11 >= 1.5.99.902 (bug <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=1769">1769</a>.)