From: Derek Mauro <dmauro@google.com>
Date: Wed, 4 Jan 2023 20:49:23 +0000 (-0800)
Subject: Workaround for GCC12 bug illustrated by https://godbolt.org/z/Pe5aE59xG
X-Git-Tag: v1.13.0~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0296d7d37007ec54441cb9f8cd001da6ac58eea8;p=googletest.git

Workaround for GCC12 bug illustrated by https://godbolt.org/z/Pe5aE59xG

Fixes #4108

PiperOrigin-RevId: 499556061
Change-Id: I1cb1564f9b77e1825fddc9236965f4a3b661d96a
---

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 0803cf3..08eaefb 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -4888,7 +4888,8 @@ std::string StreamingListener::UrlEncode(const char* str) {
       case '=':
       case '&':
       case '\n':
-        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
+        result.push_back('%');
+        result.append(String::FormatByte(static_cast<unsigned char>(ch)));
         break;
       default:
         result.push_back(ch);