File: 0053.patch

package info (click to toggle)
firefox-esr 140.5.0esr-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 4,538,920 kB
  • sloc: cpp: 7,381,527; javascript: 6,388,905; ansic: 3,710,087; python: 1,393,776; xml: 628,165; asm: 426,916; java: 184,004; sh: 65,744; makefile: 19,302; objc: 13,059; perl: 12,912; yacc: 4,583; cs: 3,846; pascal: 3,352; lex: 1,720; ruby: 1,226; exp: 762; php: 436; lisp: 258; awk: 247; sql: 66; sed: 54; csh: 10
file content (29 lines) | stat: -rw-r--r-- 1,132 bytes parent folder | download | duplicates (9)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
From: Michael Froman <mjfroman@mac.com>
Date: Fri, 8 Apr 2022 11:36:36 -0500
Subject: Bug 1766646 - (fix-b556b08668) avoid InlinedVector method that can
 throw exception

---
 api/video_codecs/video_encoder.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
index 40726431bd..4e3369000c 100644
--- a/api/video_codecs/video_encoder.cc
+++ b/api/video_codecs/video_encoder.cc
@@ -190,7 +190,15 @@ std::string VideoEncoder::EncoderInfo::ToString() const {
   for (size_t i = 0; i < preferred_pixel_formats.size(); ++i) {
     if (i > 0)
       oss << ", ";
+#if defined(WEBRTC_MOZILLA_BUILD)
+    // This could assert, as opposed to throw using the form in the
+    // else, but since we're in a for loop that uses .size() we can
+    // be fairly sure that this is safe without doing a further
+    // check to make sure 'i' is in-range.
+    oss << VideoFrameBufferTypeToString(preferred_pixel_formats[i]);
+#else
     oss << VideoFrameBufferTypeToString(preferred_pixel_formats.at(i));
+#endif
   }
   oss << "]";
   if (is_qp_trusted.has_value()) {