Fix Linux build errors after QUIC build is enabled. (#502)

* Fix Linux build errors after quic is enabled.

* Check result of snprintf.

Author: taste1981

DEPS

@@ -3069,18 +3069,6 @@ hooks = [
     'condition': 'checkout_mac',
     'action': ['python', 'src/build/mac_toolchain.py'],
   },
-  # Pull binutils for linux, enabled debug fission for faster linking /
-  # debugging when used with clang on Ubuntu Precise.
-  # https://code.google.com/p/chromium/issues/detail?id=352046
-  {
-    'name': 'binutils',
-    'pattern': 'src/third_party/binutils',
-    'condition': 'host_os == "linux"',
-    'action': [
-        'python',
-        'src/third_party/binutils/download.py',
-    ],
-  },
   {
     # Note: On Win, this should run after win_toolchain, as it may use it.
     'name': 'clang',

scripts/build_linux.py

@@ -46,7 +46,7 @@ def gen_lib_path(scheme):
     out_lib = OUT_LIB % {'scheme': scheme}
     return os.path.join(r'out', out_lib)
 
-def gngen(arch, ssl_root, msdk_root, scheme, tests, use_gcc, fake_audio):
+def gngen(arch, ssl_root, msdk_root, quic_root, scheme, tests, use_gcc, fake_audio):
     gn_args = list(GN_ARGS)
     gn_args.append('target_cpu="%s"' % arch)
     if scheme == 'release':
@@ -70,6 +70,16 @@ def gngen(arch, ssl_root, msdk_root, scheme, tests, use_gcc, fake_audio):
         gn_args.append('owt_msdk_lib_root="%s"' % msdk_lib)
     else:
         print('msdk_root is not set.')
+    if quic_root:
+        gn_args.append('owt_quic_header_root="%s"' % (quic_root + r'\include'))
+        if scheme == 'release':
+            quic_lib = quic_root + r'\bin\release'
+        elif scheme == 'debug':
+            quic_lib = quic_root + r'\bin\debug'
+        else:
+            return False
+        gn_args.append('owt_use_quic=true')
+
     if tests:
         gn_args.append('rtc_include_tests=true')
         gn_args.append('owt_include_tests=true')
@@ -149,6 +159,7 @@ def main():
                         help='Target architecture. Supported value: x86, x64')
     parser.add_argument('--ssl_root', help='Path for OpenSSL.')
     parser.add_argument('--msdk_root', help='Path for MSDK.')
+    parser.add_argument('--quic_root', help='Path to QUIC library')
     parser.add_argument('--scheme', default='debug', choices=('debug', 'release'),
                         help='Schemes for building. Supported value: debug, release')
     parser.add_argument('--gn_gen', default=False, action='store_true',
@@ -166,7 +177,7 @@ def main():
     opts = parser.parse_args()
     print(opts)
     if opts.gn_gen:
-        if not gngen(opts.arch, opts.ssl_root, opts.msdk_root, opts.scheme, opts.tests, opts.use_gcc, opts.fake_audio):
+        if not gngen(opts.arch, opts.ssl_root, opts.msdk_root, opts.quic_root, opts.scheme, opts.tests, opts.use_gcc, opts.fake_audio):
             return 1
     if opts.sdk:
          if not ninjabuild(opts.arch, opts.scheme):

talk/owt/sdk/base/stream.cc

@@ -385,10 +385,12 @@ void Stream::TriggerOnStreamUnmute(TrackKind track_kind) {
 }
 #if !defined(WEBRTC_WIN)
 LocalStream::LocalStream() {}
+#if !defined(WEBRTC_LINUX)
 LocalStream::LocalStream(MediaStreamInterface* media_stream,
                          StreamSourceInfo source)
     : Stream(media_stream, source) {}
 #endif
+#endif
 LocalStream::~LocalStream() {
   RTC_LOG(LS_INFO) << "Destroy LocalCameraStream.";
   if (media_stream_ != nullptr) {

talk/owt/sdk/conference/conferencewebtransportchannel.cc

@@ -373,11 +373,15 @@ static std::string ConvertToUUID(uint8_t* src) {
     return "";
   char* dst = new char[UUID_TEXT_LEN_PLUS_1];
   memset(dst, 0, UUID_TEXT_LEN_PLUS_1);
-  sprintf_s(dst, UUID_TEXT_LEN_PLUS_1,
+  int bytes_written = snprintf(dst, UUID_TEXT_LEN_PLUS_1,
             "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
             src[0], src[1], src[2], src[3], src[4], src[5], src[6], src[7],
             src[8], src[9], src[10], src[11], src[12], src[13], src[14],
             src[15]);
+  if (bytes_written <= 0 || bytes_written > UUID_TEXT_LEN_PLUS_1) {
+    delete []dst;
+    return "";
+  }
   std::string uuid(dst);
   delete []dst;
   return uuid;

talk/owt/sdk/include/cpp/owt/base/stream.h

@@ -259,7 +259,9 @@ class LocalStream : public Stream {
  public:
 #if !defined(WEBRTC_WIN)
   LocalStream();
+#if !defined(WEBRTC_LINUX)
   LocalStream(MediaStreamInterface* media_stream, StreamSourceInfo source);
+#endif
 #endif
   virtual ~LocalStream();
   using Stream::Attributes;