summaryrefslogtreecommitdiffstats
path: root/courgette
diff options
context:
space:
mode:
authorhalyavin <halyavin@chromium.org>2015-03-12 16:20:16 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-12 23:21:42 +0000
commit7983586249a719e04aeb37af272f253c7c69372e (patch)
treeea450a734a7b2dbee8ea182c735c88804ca34468 /courgette
parent801f3eeed1328e9c68def11463782e261b1e1839 (diff)
downloadchromium_src-7983586249a719e04aeb37af272f253c7c69372e.zip
chromium_src-7983586249a719e04aeb37af272f253c7c69372e.tar.gz
chromium_src-7983586249a719e04aeb37af272f253c7c69372e.tar.bz2
Fix NULL pointer access in AssemblyProgram::FindLabel.
TEST= none BUG= none Review URL: https://codereview.chromium.org/1001603005 Cr-Commit-Position: refs/heads/master@{#320405}
Diffstat (limited to 'courgette')
-rw-r--r--courgette/assembly_program.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/courgette/assembly_program.cc b/courgette/assembly_program.cc
index 19cee9b..027539e 100644
--- a/courgette/assembly_program.cc
+++ b/courgette/assembly_program.cc
@@ -250,6 +250,8 @@ Label* AssemblyProgram::FindLabel(RVA rva, RVAToLabel* labels) {
Label*& slot = (*labels)[rva];
if (slot == NULL) {
slot = new(std::nothrow) Label(rva);
+ if (slot == NULL)
+ return NULL;
}
slot->count_++;
return slot;