Skip to content

deps: float b18162a7c from openssl (CVE-2018-5407) (8.x and 6.x only) #24352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rvagg wants to merge 4 commits into from
Closed

deps: float b18162a7c from openssl (CVE-2018-5407) (8.x and 6.x only) #24352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcf3fcc
deps: cherry-pick 6bc4bfe from V8 upstream
Oct 29, 2018
a2c76b3
deps: cherry-pick d2e0166 from V8 upstream
Oct 29, 2018
e083cc1
deps,v8: fix gyp build on Aix platform
Oct 29, 2018
4b7f9bb
deps: float b18162a7c from openssl (CVE-2018-5407)
rvagg Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
deps,v8: fix gyp build on Aix platform 
Floating this patch since the code does not exist upstream anymore.

deps/v8/testing/gtest.gyp:
Suppress -Wnonnull-compare, -Waddress warnings for
deps/v8/testing/gtest project;

deps/v8/src/compiler/store-store-elimination.cc,
deps/v8/src/conversions.cc:
Suppress unused function warnings in order to compile with newer
(>4.8.5) gcc on Aix.

PR-URL: #23958
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
  • Loading branch information
@BethGriggs
Vasili Skurydzin authored and BethGriggs committed Nov 12, 2018
commit e083cc17c32699a3b6cb795d0931554106a2c0ae
2 changes: 1 addition & 1 deletion deps/v8/include/v8-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 6
#define V8_MINOR_VERSION 2
#define V8_BUILD_NUMBER 414
#define V8_PATCH_LEVEL 72
#define V8_PATCH_LEVEL 73

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
6 changes: 6 additions & 0 deletions deps/v8/src/compiler/store-store-elimination.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ void StoreStoreElimination::Run(JSGraph* js_graph, Zone* temp_zone) {
}
}

#if V8_OS_AIX
ALLOW_UNUSED_TYPE
#endif
bool RedundantStoreFinder::IsEffectful(Node* node) {
return (node->op()->EffectInputCount() >= 1);
}
Expand Down Expand Up @@ -552,6 +555,9 @@ bool UnobservableStore::operator==(const UnobservableStore other) const {
return (id_ == other.id_) && (offset_ == other.offset_);
}

#if V8_OS_AIX
ALLOW_UNUSED_TYPE
#endif
bool UnobservableStore::operator!=(const UnobservableStore other) const {
return !(*this == other);
}
Expand Down
6 changes: 6 additions & 0 deletions deps/v8/src/conversions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,17 @@ class StringCharacterStreamIterator {
};


#if V8_OS_AIX
ALLOW_UNUSED_TYPE
#endif
StringCharacterStreamIterator::StringCharacterStreamIterator(
StringCharacterStream* stream) : stream_(stream) {
++(*this);
}

#if V8_OS_AIX
ALLOW_UNUSED_TYPE
#endif
uint16_t StringCharacterStreamIterator::operator*() const {
return current_;
}
Expand Down
4 changes: 4 additions & 0 deletions deps/v8/testing/gtest.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@
'action????': ['$(TargetPath)', '--gtest_print_time'],
},
}],
['OS=="aix"', {
'cflags': [ '-Wno-nonnull-compare',
'-Wno-address' ],
}],
],
}],
],
Expand Down