| OLD | NEW |
| 1 # See https://bugs.kde.org/show_bug.cgi?id=205541#c1 | 1 # See https://bugs.kde.org/show_bug.cgi?id=205541#c1 |
| 2 Index: memcheck/mc_main.c | 2 Index: memcheck/mc_main.c |
| 3 =================================================================== | 3 =================================================================== |
| 4 --- memcheck/mc_main.c (revision 10877) | 4 --- memcheck/mc_main.c (revision 10877) |
| 5 +++ memcheck/mc_main.c (working copy) | 5 +++ memcheck/mc_main.c (working copy) |
| 6 @@ -3708,7 +3708,14 @@ | 6 @@ -3708,7 +3708,14 @@ |
| 7 if (rr || ww || xx) | 7 if (rr || ww || xx) |
| 8 MC_(make_mem_defined)(a, len); | 8 MC_(make_mem_defined)(a, len); |
| 9 else | 9 else |
| 10 - MC_(make_mem_noaccess)(a, len); | 10 - MC_(make_mem_noaccess)(a, len); |
| 11 + MC_(make_mem_defined)(a, len); | 11 + MC_(make_mem_defined)(a, len); |
| 12 + /* State after mmap(,,PROT_NONE,,,) should match | 12 + /* State after mmap(,,PROT_NONE,,,) should match |
| 13 + * state after mprotect(,,PROT_NONE): the operating system | 13 + * state after mprotect(,,PROT_NONE): the operating system |
| 14 + * will trap any access, but any subsequent mprotect(,,PROT_R|W|X) | 14 + * will trap any access, but any subsequent mprotect(,,PROT_R|W|X) |
| 15 + * will re-instate the previous V bits [in this case, all valid]. | 15 + * will re-instate the previous V bits [in this case, all valid]. |
| 16 + * See comment in mc_pre_clo_init() re: | 16 + * See comment in mc_pre_clo_init() re: |
| 17 + * VG_(track_change_mem_mprotect) ( NULL ); | 17 + * VG_(track_change_mem_mprotect) ( NULL ); |
| 18 + */ | 18 + */ |
| 19 } | 19 } |
| 20 | 20 |
| 21 static | 21 static |
| OLD | NEW |