summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Gilli <julien.gilli@joyent.com>2015-07-03 17:33:28 -0700
committerJulien Gilli <julien.gilli@joyent.com>2015-07-03 17:33:28 -0700
commit0be9a77bb18ec15b4fb6a1fb0762f313b7351201 (patch)
tree56608a75ec9eca35f2d205b1598dce8ec60d59a6
parent78b0e30954111cfaba0edbeee85450d8cbc6fdf6 (diff)
downloadnode-v0.12.6-release.tar.gz
2015.07.03, Version 0.12.6 (Stable)v0.12.6v0.12.6-release
* V8: fix out-of-band write in utf8 decoder
-rw-r--r--ChangeLog7
-rw-r--r--src/node_version.h2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 27f5240f8..6cd37fef9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2015.06.22, Version 0.12.5 (Stable)
+2015.07.03, Version 0.12.6 (Stable)
+
+* V8: fix out-of-band write in utf8 decoder
+
+
+2015.06.22, Version 0.12.5 (Stable), 61c6abf00898fe00eb7fcf2c23ba0b01cf12034c
* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
diff --git a/src/node_version.h b/src/node_version.h
index c0359cec8..bd4c1eaa9 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 12
#define NODE_PATCH_VERSION 6
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""