From 59aae51046e79b1c8a3cf2473fd4618e9d617ac6 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 30 Nov 2015 18:50:31 +0100
Subject: Remove ERTS_PRINT_INVALID from erts_print()

ERTS_PRINT_INVALID prevented file descriptor 0 to be used which
could cause an empty crash dump.
---
 erts/emulator/beam/sys.h   | 1 -
 erts/emulator/beam/utils.c | 3 ---
 2 files changed, 4 deletions(-)

(limited to 'erts')

diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index c29d4b3777..f8ab0df082 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -577,7 +577,6 @@ Uint erts_sys_misc_mem_sz(void);
 /* Io constants to erts_print and erts_putc */
 #define ERTS_PRINT_STDERR	(2)
 #define ERTS_PRINT_STDOUT	(1)
-#define ERTS_PRINT_INVALID	(0) /* Don't want to use 0 since CBUF was 0 */
 #define ERTS_PRINT_FILE		(-1)
 #define ERTS_PRINT_SBUF		(-2)
 #define ERTS_PRINT_SNBUF	(-3)
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index a8bbdb9354..ebc549fb31 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -343,9 +343,6 @@ erts_print(int to, void *arg, char *format, ...)
 	case ERTS_PRINT_DSBUF:
 	    res = erts_vdsprintf((erts_dsprintf_buf_t *) arg, format, arg_list);
 	    break;
-	case ERTS_PRINT_INVALID:
-	    res = -EINVAL;
-	    break;
 	default:
 	    res = erts_vfdprintf((int) to, format, arg_list);
 	    break;
-- 
cgit v1.2.3


From 6fd3aba6bc714b779c5c91ed998a7661190ec882 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 4 Dec 2015 15:13:14 +0100
Subject: Prepare release

---
 erts/doc/src/notes.xml | 16 ++++++++++++++++
 erts/vsn.mk            |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index a64d699cec..9ff2e5de08 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,22 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 6.4.1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a bug that could cause a crash dump to become
+	    almost empty.</p>
+          <p>
+	    Own Id: OTP-13150</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 6.4.1.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 4f5002d401..98946f4797 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 6.4.1.4
+VSN = 6.4.1.5
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3