Skip to content

Commit

Permalink
i#1649 rank order: avoid looking up module in dynamo_areas
Browse files Browse the repository at this point in the history
Fixes a rank order violation when logging is enabled, which showed up in
the client.alloc test but could happen in other circumstances: we can't
look up module info while operating on dynamo_areas.

Fixes #1649

Review-URL: https://codereview.appspot.com/224880043
  • Loading branch information
derekbruening committed Mar 31, 2015
1 parent 8543aa3 commit cf3d7e1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion core/vmareas.c
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,8 @@ print_vm_area(vm_area_vector_t *v, vm_area_t *area, file_t outf, const char *pre
app_pc modbase =
/* avoid rank order violation */
IF_NO_MEMQUERY(v == all_memory_areas ? NULL :)
get_module_base(area->start);
/* i#1649: avoid rank order for dynamo_areas */
(v == dynamo_areas ? NULL : get_module_base(area->start));
if (modbase != NULL &&
/* avoid rank order violations */
v != dynamo_areas &&
Expand Down

0 comments on commit cf3d7e1

Please sign in to comment.