From 435c182ae66906891d4345159577a11ae5addbf7 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 11 Jun 2024 14:17:16 -0700
Subject: [PATCH] Update linker version script globs to include `*pb::*`
 instead of just `pb::*`

For some reason it seems that `pb::*` does not match the type info symbol for
`pb::CppFeatures`. Ordinarily this does not seem to cause problems, but we
received a report about it causing issues with sanitizers:
https://groups.google.com/g/protobuf/c/ytkvjXXdG2g/m/hk7a5JnCAwAJ

For clarity I made the same change for `upb::`, though I don't think this is
strictly necessary since it is covered by the `*pb::*` glob.

PiperOrigin-RevId: 642390692
---
 src/libprotobuf-lite.map | 2 +-
 src/libprotobuf.map      | 2 +-
 src/libprotoc.map        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libprotobuf-lite.map b/src/libprotobuf-lite.map
index 6f3a36e481..84fa2fd019 100644
--- a/src/libprotobuf-lite.map
+++ b/src/libprotobuf-lite.map
@@ -2,7 +2,7 @@
   global:
     extern "C++" {
       *google*;
-      pb::*;
+      *pb::*;
     };
     scc_info_*;
     descriptor_table_*;
diff --git a/src/libprotobuf.map b/src/libprotobuf.map
index 6f3a36e481..84fa2fd019 100644
--- a/src/libprotobuf.map
+++ b/src/libprotobuf.map
@@ -2,7 +2,7 @@
   global:
     extern "C++" {
       *google*;
-      pb::*;
+      *pb::*;
     };
     scc_info_*;
     descriptor_table_*;
diff --git a/src/libprotoc.map b/src/libprotoc.map
index 24a5f76a55..0367abd2ce 100644
--- a/src/libprotoc.map
+++ b/src/libprotoc.map
@@ -2,8 +2,8 @@
   global:
     extern "C++" {
       *google*;
-      pb::*;
-      upb::*;
+      *pb::*;
+      *upb::*;
     };
     scc_info_*;
     descriptor_table_*;