ots

youtube · May 8, 2024 · a4feae6 · a4feae6
1 parent 16073f4
commit a4feae6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 35 deletions.
diff --git a/third_party/ots/BUILD.gn b/third_party/ots/BUILD.gn
@@ -1,12 +1,11 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//testing/libfuzzer/fuzzer_test.gni")
 
 config("ots_config") {
   include_dirs = [ "src/include" ]
-  defines = [ "HAVE_CONFIG_H" ]
 }
 
 static_library("ots") {
@@ -99,5 +98,6 @@ static_library("ots") {
     "//third_party/zlib",
   ]
 
+  configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
 }
diff --git a/third_party/ots/OWNERS b/third_party/ots/OWNERS
@@ -1,5 +1,5 @@
 [email protected]
 [email protected]
-drott@chromium.rg
+drott@chromium.org
 [email protected]
 [email protected]
diff --git a/third_party/ots/README.chromium b/third_party/ots/README.chromium
@@ -1,6 +1,6 @@
 Name: OTS (OpenType Sanitizer)
 URL: https://github.com/khaledhosny/ots.git
-Version: ee537ac096667eed6559124164c3e8482646fd77
+Version: 46bea9879127d0ff1c6601b078e2ce98e83fcd33
 Security Critical: yes
 License: BSD
 

diff --git a/third_party/ots/fuzz/ots_fuzzer.cc b/third_party/ots/fuzz/ots_fuzzer.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

diff --git a/third_party/ots/src/include/config.h b/third_party/ots/src/include/config.h
diff --git a/third_party/ots/src/include/ots-memory-stream.h b/third_party/ots/src/include/ots-memory-stream.h
@@ -24,7 +24,7 @@ class MemoryStream : public OTSStream {
       return false;
     }
     std::memcpy(static_cast<char*>(ptr_) + off_, data, length);
-    off_ += static_cast<off_t>(length);
+    off_ += length;
     return true;
   }
 
@@ -78,7 +78,7 @@ class ExpandingMemoryStream : public OTSStream {
       return WriteRaw(data, length);
     }
     std::memcpy(static_cast<char*>(ptr_) + off_, data, length);
-    off_ += static_cast<off_t>(length);
+    off_ += length;
     return true;
   }