--- old/src/share/vm/runtime/commandLineFlagRangeList.cpp	2015-11-10 13:21:45.000000000 -0600
+++ new/src/share/vm/runtime/commandLineFlagRangeList.cpp	2015-11-10 13:21:45.000000000 -0600
@@ -279,7 +279,7 @@
 // Generate func argument to pass into emit_range_xxx functions
 #define EMIT_RANGE_CHECK(a, b)                               , a, b
 
-#define INITIAL_RANGES_SIZE 204
+#define INITIAL_RANGES_SIZE 205
 GrowableArray<CommandLineFlagRange*>* CommandLineFlagRangeList::_ranges = NULL;
 
 // Check the ranges of all flags that have them
--- old/src/share/vm/runtime/globals.hpp	2015-11-10 13:21:45.000000000 -0600
+++ new/src/share/vm/runtime/globals.hpp	2015-11-10 13:21:45.000000000 -0600
@@ -1026,6 +1026,7 @@
   product(uintx, ErrorLogTimeout, 2 * 60,                                   \
           "Timeout, in seconds, to limit the time spent on writing an "     \
           "error log in case of a crash.")                                  \
+          range(1, 60 * 60)                                                 \
                                                                             \
   product_pd(bool, UseOSErrorReporting,                                     \
           "Let VM fatal error propagate to the OS (ie. WER on Windows)")    \
--- old/src/share/vm/runtime/thread.cpp	2015-11-10 13:21:46.000000000 -0600
+++ new/src/share/vm/runtime/thread.cpp	2015-11-10 13:21:46.000000000 -0600
@@ -1299,7 +1299,7 @@
         if (!ShowMessageBoxOnError
             && (OnError == NULL || OnError[0] == '\0')
             && Arguments::abort_hook() == NULL) {
-          os::sleep(this, ErrorLogTimeout * 60 * 1000, false);
+          os::sleep(this, ErrorLogTimeout * 1000, false); // in seconds
           fdStream err(defaultStream::output_fd());
           err.print_raw_cr("# [ timer expired, abort... ]");
           // skip atexit/vm_exit/vm_abort hooks