Merge remote-tracking branch 'origin/jq/memcatch'

inkydragon · Jun 12, 2015 · 84f14d1 · 84f14d1
2 parents 22ecc91 + a2b6943
commit 84f14d1
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 4 deletions.
diff --git a/base/boot.jl b/base/boot.jl
@@ -139,8 +139,8 @@ export
  # string types
  Char, ASCIIString, ByteString, DirectIndexString, AbstractString, UTF8String,
  # errors
- BoundsError, DivideError, DomainError, Exception,
- InexactError, InterruptException, OutOfMemoryError, OverflowError,
+ BoundsError, DivideError, DomainError, Exception, InexactError,
+ InterruptException, OutOfMemoryError, ReadOnlyMemoryError, OverflowError,
  StackOverflowError, SegmentationFault, UndefRefError, UndefVarError,
  # AST representation
  Expr, GotoNode, LabelNode, LineNumberNode, QuoteNode, SymbolNode, TopNode,
@@ -223,6 +223,7 @@ immutable DomainError <: Exception end
 immutable OverflowError <: Exception end
 immutable InexactError <: Exception end
 immutable OutOfMemoryError <: Exception end
+immutable ReadOnlyMemoryError<: Exception end
 immutable SegmentationFault <: Exception end
 immutable StackOverflowError <: Exception end
 immutable UndefRefError <: Exception end

diff --git a/base/essentials.jl b/base/essentials.jl
@@ -24,6 +24,7 @@ call(T::Type{DomainError}) = Core.call(T)
 call(T::Type{OverflowError}) = Core.call(T)
 call(T::Type{InexactError}) = Core.call(T)
 call(T::Type{OutOfMemoryError}) = Core.call(T)
+call(T::Type{ReadOnlyMemoryError}) = Core.call(T)
 call(T::Type{StackOverflowError}) = Core.call(T)
 call(T::Type{SegmentationFault}) = Core.call(T)
 call(T::Type{UndefRefError}) = Core.call(T)

diff --git a/doc/manual/control-flow.rst b/doc/manual/control-flow.rst
@@ -625,6 +625,8 @@ built-in :exc:`Exception`\ s listed below all interrupt the normal flow of contr
 +---------------------------+
 | :exc:`OutOfMemoryError` |
 +---------------------------+
+| :exc:`ReadOnlyMemoryError`|
++---------------------------+
 | :exc:`MethodError` |
 +---------------------------+
 | :exc:`OverflowError` |

diff --git a/doc/stdlib/base.rst b/doc/stdlib/base.rst
@@ -891,6 +891,10 @@ Errors
 
  An operation allocated too much memory for either the system or the garbage collector to handle properly.
 
+.. function:: ReadOnlyMemoryError()
+
+ An operation tried to write to memory that is read-only.
+
 .. function:: OverflowError()
 
  The result of an expression is too large for the specified type and will cause a wraparound.

diff --git a/src/alloc.c b/src/alloc.c
@@ -73,6 +73,7 @@ jl_value_t *jl_undefref_exception;
 jl_value_t *jl_interrupt_exception;
 jl_datatype_t *jl_boundserror_type;
 jl_value_t *jl_memory_exception;
+jl_value_t *jl_readonlymemory_exception;
 
 jl_sym_t *call_sym; jl_sym_t *dots_sym;
 jl_sym_t *call1_sym; jl_sym_t *module_sym;

diff --git a/src/init.c b/src/init.c
@@ -288,7 +288,7 @@ void segv_handler(int sig, siginfo_t *info, void *context)
  sigemptyset(&sset);
  sigaddset(&sset, SIGSEGV);
  sigprocmask(SIG_UNBLOCK, &sset, NULL);
- jl_throw(jl_memory_exception);
+ jl_throw(jl_readonlymemory_exception);
  }
 #ifdef SEGV_EXCEPTION
  else if (sig == SIGSEGV) {
@@ -396,6 +396,11 @@ static LONG WINAPI _exception_handler(struct _EXCEPTION_POINTERS *ExceptionInfo,
  case EXCEPTION_STACK_OVERFLOW:
  jl_throw_in_ctx(jl_stackovf_exception, ExceptionInfo->ContextRecord,in_ctx&&pSetThreadStackGuarantee);
  return EXCEPTION_CONTINUE_EXECUTION;
+ case EXCEPTION_ACCESS_VIOLATION:
+ if (ExceptionInfo->ExceptionRecord->ExceptionInformation[0] == 1) { // writing to read-only memory (e.g. mmap)
+ jl_throw_in_ctx(jl_readonlymemory_exception, ExceptionInfo->ContextRecord,in_ctx);
+ return EXCEPTION_CONTINUE_EXECUTION;
+ }
  }
  jl_safe_printf("\nPlease submit a bug report with steps to reproduce this fault, and any error messages that follow (in their entirety). Thanks.\nException: ");
  switch (ExceptionInfo->ExceptionRecord->ExceptionCode) {
@@ -775,7 +780,7 @@ void darwin_stack_overflow_handler(unw_context_t *uc)
 void darwin_accerr_handler(unw_context_t *uc)
 {
  bt_size = rec_backtrace_ctx(bt_data, MAX_BT_SIZE, uc);
- jl_exception_in_transit = jl_memory_exception;
+ jl_exception_in_transit = jl_readonlymemory_exception;
  jl_rethrow();
 }
 
@@ -1366,6 +1371,7 @@ void jl_get_builtin_hooks(void)
  jl_interrupt_exception = jl_new_struct_uninit((jl_datatype_t*)core("InterruptException"));
  jl_boundserror_type = (jl_datatype_t*)core("BoundsError");
  jl_memory_exception = jl_new_struct_uninit((jl_datatype_t*)core("OutOfMemoryError"));
+ jl_readonlymemory_exception = jl_new_struct_uninit((jl_datatype_t*)core("ReadOnlyMemoryError"));
 
 #ifdef SEGV_EXCEPTION
  jl_segv_exception = jl_new_struct_uninit((jl_datatype_t*)core("SegmentationFault"));

diff --git a/src/julia.h b/src/julia.h
@@ -406,6 +406,7 @@ extern DLLEXPORT jl_datatype_t *jl_methoderror_type;
 extern DLLEXPORT jl_datatype_t *jl_undefvarerror_type;
 extern DLLEXPORT jl_value_t *jl_stackovf_exception;
 extern DLLEXPORT jl_value_t *jl_memory_exception;
+extern DLLEXPORT jl_value_t *jl_readonlymemory_exception;
 extern DLLEXPORT jl_value_t *jl_diverror_exception;
 extern DLLEXPORT jl_value_t *jl_domain_exception;
 extern DLLEXPORT jl_value_t *jl_overflow_exception;

diff --git a/test/file.jl b/test/file.jl
@@ -210,6 +210,8 @@ c[5] = UInt8('x')
 Libc.msync(c)
 close(s)
 s = open(file, "r")
+c = mmap_array(UInt8, (11,), s)
+@test_throws ReadOnlyMemoryError c[5] = UInt8('x')
 str = readline(s)
 close(s)
 @test startswith(str, "Hellx World")