update README and patchlevel.h

diff --git a/README b/README
index 36c2368a76bf1e3da16ea420e9dc5cd15a726eea..6ccd32e92d017d3a21f57c8a23c603d082899274 100644 (file)
--- a/README
+++ b/README
@@ -18,20 +18,15 @@ section.
 Below you will find some other general notes that were not considered
 spoilers:
 
-FIXME: Update depending on whether cherry-picks are included or not
--- start cherry-pick entries
  *  fix accessing mons[-1] when trying to gate in a non-valid demon
  *  fix accessing mons[-1] when monster figures out if a tin cures stoning
- *  walking out of tethered-to-buried-object trap condition was supposed to
- *      reinstate punishment but wasn't finding the buried iron ball because
- *      the trap condition was cleared first to indicate escape; result was
- *      attached chain that got dragged around but had no ball attached
---- end cherry-pick entries
  *  have string_for_opt() return empty_optstr on failure
  *  ensure existing callers of string_for_opt() check return value before using it
  *  fix potential buffer overflow in add_menu_coloring()0
  *  fix potential buffer overflow in sym_val()
  *  fix potential buffer overflow in pline(), raw_printf(), and config_error_add()
+ *  fix potential buffer overflow in choose_windows()
+ *  use vsnprintf instead of vsprintf in pline.c where possible
  *  Windows: incldues a fix from a 3.6.4 post-release update where 
  *      OPTIONS=map_mode:fit_to_screen could cause a game start failure
 

diff --git a/include/patchlevel.h b/include/patchlevel.h
index 46e42f800e71420a980c771e57a3db2cebbb49d4..1f208d380b547bfa4b808a3b58a0fcea4bc16815 100644 (file)
--- a/include/patchlevel.h
+++ b/include/patchlevel.h
@@ -38,20 +38,15 @@
 
 /*  Patch 5, January ??, 2020
  *
- * FIXME: update entries depending on whether the cherry-picks are included
- *  -- start cherry-pick entries
  *  fix accessing mons[-1] when trying to gate in a non-valid demon
  *  fix accessing mons[-1] when monster figures out if a tin cures stoning
- *  walking out of tethered-to-buried-object trap condition was supposed to
- *      reinstate punishment but wasn't finding the buried iron ball because
- *      the trap condition was cleared first to indicate escape; result was
- *      attached chain that got dragged around but had no ball attached
- *  -- end cherry-pick entries
  *  have string_for_opt() return empty_optstr on failure
  *  ensure existing callers of string_for_opt() check return value before using it
  *  fix potential buffer overflow in add_menu_coloring()0
  *  fix potential buffer overflow in sym_val()
  *  fix potential buffer overflow in pline(), raw_printf(), and config_error_add()
+ *  fix potential buffer overflow in choose_windows()
+ *  use vsnprintf instead of vsprintf in pline.c where possible
  *  Windows: incldues a fix from a 3.6.4 post-release update where 
  *      OPTIONS=map_mode:fit_to_screen could cause a game start failure
  */