Submitted by: cpm Obtained from: https://github.com/cpu82/freebsd-chromium MFH: 2018Q1 Security: https://vuxml.freebsd.org/freebsd/e264e74e-ffe0-11e7-8b91-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/1d951e85-ffdb-11e7-8b91-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/82894193-ffd4-11e7-8b91-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/f8e72cd4-c66a-11e7-bb17-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/3cd46257-bbc5-11e7-a3bc-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/a692bffe-b6ad-11e7-a1c2-e8e0b747a45a.html
98 lines
4.3 KiB
Text
98 lines
4.3 KiB
Text
--- base/strings/safe_sprintf_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300
|
|
+++ base/strings/safe_sprintf_unittest.cc 2016-10-25 21:42:28.951114000 +0300
|
|
@@ -728,6 +728,7 @@
|
|
}
|
|
|
|
TEST(SafeSPrintfTest, EmitNULL) {
|
|
+/* Avoid compiler error: http://pastebin.com/1edWUE84
|
|
char buf[40];
|
|
#if defined(__GNUC__)
|
|
#pragma GCC diagnostic push
|
|
@@ -739,6 +740,7 @@
|
|
EXPECT_EQ("0x0", std::string(buf));
|
|
EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL));
|
|
EXPECT_EQ("<NULL>", std::string(buf));
|
|
+*/
|
|
#if defined(__GCC__)
|
|
#pragma GCC diagnostic pop
|
|
#endif
|
|
--- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200
|
|
+++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200
|
|
@@ -60,7 +60,7 @@
|
|
void ThreadLocalStorageCleanup(void *value) {
|
|
int *ptr = reinterpret_cast<int*>(value);
|
|
// Destructors should never be called with a NULL.
|
|
- ASSERT_NE(reinterpret_cast<int*>(NULL), ptr);
|
|
+ ASSERT_NE(static_cast<int*>(NULL), ptr);
|
|
if (*ptr == kFinalTlsValue)
|
|
return; // We've been called enough times.
|
|
ASSERT_LT(kFinalTlsValue, *ptr);
|
|
--- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200
|
|
+++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200
|
|
@@ -387,7 +387,7 @@
|
|
// |stream| is closed at this point. Start() should reopen it again.
|
|
EXPECT_CALL(manager(), MakeAudioOutputStream(_, _))
|
|
.Times(2)
|
|
- .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL)));
|
|
+ .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
|
|
|
|
EXPECT_CALL(callback_, OnError(_))
|
|
.Times(2);
|
|
--- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2017-04-19 19:06:52 UTC
|
|
+++ third_party/libjingle_xmpp/task_runner/taskrunner.cc
|
|
@@ -95,7 +95,7 @@ void TaskRunner::InternalRunTasks(bool i
|
|
std::vector<Task *>::iterator it;
|
|
it = std::remove(tasks_.begin(),
|
|
tasks_.end(),
|
|
- reinterpret_cast<Task *>(NULL));
|
|
+ static_cast<Task *>(NULL));
|
|
|
|
tasks_.erase(it, tasks_.end());
|
|
|
|
--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200
|
|
+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200
|
|
@@ -439,7 +439,7 @@
|
|
}
|
|
|
|
CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id)
|
|
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
|
|
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
|
|
CMapFormat::kFormat0,
|
|
cmap_id) {
|
|
}
|
|
@@ -563,7 +563,7 @@
|
|
: CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>(
|
|
data->Slice(offset, data->ReadUShort(
|
|
offset + Offset::kFormat0Length)))
|
|
- : reinterpret_cast<WritableFontData*>(NULL),
|
|
+ : static_cast<WritableFontData*>(NULL),
|
|
CMapFormat::kFormat2, cmap_id) {
|
|
// TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
|
|
}
|
|
@@ -574,7 +574,7 @@
|
|
: CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>(
|
|
data->Slice(offset, data->ReadUShort(
|
|
offset + Offset::kFormat0Length)))
|
|
- : reinterpret_cast<ReadableFontData*>(NULL),
|
|
+ : static_cast<ReadableFontData*>(NULL),
|
|
CMapFormat::kFormat2, cmap_id) {
|
|
// TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
|
|
}
|
|
@@ -958,7 +958,7 @@
|
|
CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments,
|
|
IntegerList* glyph_id_array,
|
|
const CMapId& cmap_id)
|
|
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
|
|
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
|
|
CMapFormat::kFormat4, cmap_id),
|
|
segments_(segments->begin(), segments->end()),
|
|
glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) {
|
|
@@ -966,7 +966,7 @@
|
|
}
|
|
|
|
CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id)
|
|
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
|
|
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
|
|
CMapFormat::kFormat4, cmap_id) {
|
|
}
|
|
|