summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-06-13 13:56:00 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2017-07-07 09:15:59 +0000
commit70418264d9bec198284fa88d9568a070666ab48f (patch)
tree9341ceb156d74ba1af8cc51263e6b8d4440a4d08
parentcca1687647fe9a5ca828de6645c8994daca180a8 (diff)
[Backport] Fix for CVE-2017-5070
Merged: [crankshaft] Fix HAliasAnalyzer for constants Revision: e33fd30777f99a0d6e16b16d096a2663b1031457 BUG=chromium:722756 Reviewed-on: https://chromium-review.googlesource.com/508352 Change-Id: I2a89ed1b5ebfcc475b3de6c52b57a7825f0793c3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/v8/src/crankshaft/hydrogen-alias-analysis.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/v8/src/crankshaft/hydrogen-alias-analysis.h b/chromium/v8/src/crankshaft/hydrogen-alias-analysis.h
index de8d0bdbe5a..7fc15269cdf 100644
--- a/chromium/v8/src/crankshaft/hydrogen-alias-analysis.h
+++ b/chromium/v8/src/crankshaft/hydrogen-alias-analysis.h
@@ -43,7 +43,7 @@ class HAliasAnalyzer : public ZoneObject {
}
// Constant objects can be distinguished statically.
- if (a->IsConstant()) {
+ if (a->IsConstant() && b->IsConstant()) {
// TODO(titzer): DataEquals() is more efficient, but that's protected.
return a->Equals(b) ? kMustAlias : kNoAlias;
}