commit 815497495eee92e028320ef96dc5b7ec13d85216
author Nelson Billing <nbilling@google.com> Fri Feb 21 15:54:49 2020 -0800
committer Nelson Billing <nbilling@google.com> Sat Feb 22 00:03:09 2020 +0000
tree fe2ea81b30d4e754ba2e27be539f388ac67407bb
parent a4c536dc2d4dfbaa1e9d3cbb03cc4f4e98f83787

Make LibcurlWrapper support static linking.

- Didn't used to support statically linked libcurl, now it does (like
HttpUpload does).

Change-Id: Ic014548225b129f0c1c9ffe6a671f5bd2352b6e6
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2068947
Reviewed-by: Ivan Penkov <ivanpe@chromium.org>
Reviewed-by: Joshua Peraza <jperaza@chromium.org>

src/common/linux/libcurl_wrapper.cc

diff --git a/src/common/linux/libcurl_wrapper.cc b/src/common/linux/libcurl_wrapper.cc
index d935174..e96c203 100644
--- a/src/common/linux/libcurl_wrapper.cc
+++ b/src/common/linux/libcurl_wrapper.cc
@@ -173,7 +173,19 @@
 }
 
 bool LibcurlWrapper::Init() {
-  curl_lib_ = dlopen("libcurl.so", RTLD_NOW);
+  // First check to see if libcurl was statically linked:
+  curl_lib_ = dlopen(nullptr, RTLD_NOW);
+  if (curl_lib_ &&
+      (!dlsym(curl_lib_, "curl_easy_init") ||
+      !dlsym(curl_lib_, "curl_easy_setopt"))) {
+    // Not statically linked, try again below.
+    dlerror();  // Clear dlerror before attempting to open libraries.
+    dlclose(curl_lib_);
+    curl_lib_ = nullptr;
+  }
+  if (!curl_lib_) {
+    curl_lib_ = dlopen("libcurl.so", RTLD_NOW);
+  }
   if (!curl_lib_) {
     curl_lib_ = dlopen("libcurl.so.4", RTLD_NOW);
   }