From a099b168eb043bc416632de51294732cba63dbde Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Mon, 6 Jan 2025 23:02:21 +0800
Subject: [PATCH] shadowsocksr-libev: fix build error by correctly allocating
 memory for 'protocol'

Signed-off-by: sbwml <admin@cooluc.com>
---
 .../patches/104-pointer-used-after-free.patch   | 16 ----------------
 .../patches/105-Upgrade-PCRE-to-PCRE2.patch     | 17 +----------------
 shadowsocksr-libev/src/server/server.c          |  2 +-
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 shadowsocksr-libev/patches/104-pointer-used-after-free.patch

diff --git a/shadowsocksr-libev/patches/104-pointer-used-after-free.patch b/shadowsocksr-libev/patches/104-pointer-used-after-free.patch
deleted file mode 100644
index 9081d5560..000000000
--- a/shadowsocksr-libev/patches/104-pointer-used-after-free.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/server/server.c
-+++ b/server/server.c
-@@ -1942,12 +1942,12 @@
-             text = (char*)malloc(strlen(protocol) - 11);
-             memcpy(text, protocol, strlen(protocol) - 11);
-             int length = strlen(protocol) - 11;
--            free(protocol);
-             obfs = (char*)malloc(length);
-             memset(protocol, 0x00, length);
-             memcpy(protocol, text, length);
-             LOGI("protocol compatible enable, %s", protocol);
-             free(text);
-+            free(protocol);
-             protocol_compatible = 1;
-         }
-     }
diff --git a/shadowsocksr-libev/patches/105-Upgrade-PCRE-to-PCRE2.patch b/shadowsocksr-libev/patches/105-Upgrade-PCRE-to-PCRE2.patch
index 1e493bd28..c040755c6 100644
--- a/shadowsocksr-libev/patches/105-Upgrade-PCRE-to-PCRE2.patch
+++ b/shadowsocksr-libev/patches/105-Upgrade-PCRE-to-PCRE2.patch
@@ -14,8 +14,6 @@ Signed-off-by: sbwml <984419930@qq.com>
  delete mode 100644 m4/pcre.m4
  create mode 100644 m4/pcre2.m4
 
-diff --git a/configure.ac b/configure.ac
-index f9c51ab..0513db0 100755
 --- a/configure.ac
 +++ b/configure.ac
 @@ -20,10 +20,10 @@ AC_DISABLE_STATIC
@@ -33,9 +31,6 @@ index f9c51ab..0513db0 100755
  fi
  
  dnl Checks for using shared libraries from system
-diff --git a/m4/pcre.m4 b/m4/pcre.m4
-deleted file mode 100644
-index 4d965bc..0000000
 --- a/m4/pcre.m4
 +++ /dev/null
 @@ -1,152 +0,0 @@
@@ -191,9 +186,6 @@ index 4d965bc..0000000
 -AC_SUBST(pcreh)
 -AC_SUBST(pcre_pcreh)
 -])
-diff --git a/m4/pcre2.m4 b/m4/pcre2.m4
-new file mode 100644
-index 0000000..fcec4b7
 --- /dev/null
 +++ b/m4/pcre2.m4
 @@ -0,0 +1,181 @@
@@ -378,8 +370,6 @@ index 0000000..fcec4b7
 +AC_SUBST(pcre2h)
 +AC_SUBST(pcre2_pcre2h)
 +])
-diff --git a/src/rule.c b/src/rule.c
-index 8aae04e..41ba5e7 100644
 --- a/src/rule.c
 +++ b/src/rule.c
 @@ -82,14 +82,28 @@ int
@@ -417,7 +407,7 @@ index 8aae04e..41ba5e7 100644
              return 0;
          }
      }
-@@ -109,8 +123,15 @@ lookup_rule(const struct cork_dllist *rules, const char *name, size_t name_len)
+@@ -109,8 +123,15 @@ lookup_rule(const struct cork_dllist *ru
  
      cork_dllist_foreach_void(rules, curr, next) {
          rule_t *rule = cork_container_of(curr, rule_t, entries);
@@ -451,8 +441,6 @@ index 8aae04e..41ba5e7 100644
 +    }
      ss_free(rule);
  }
-diff --git a/src/rule.h b/src/rule.h
-index 015bc42..84a89af 100644
 --- a/src/rule.h
 +++ b/src/rule.h
 @@ -33,17 +33,27 @@
@@ -489,6 +477,3 @@ index 015bc42..84a89af 100644
  
      struct cork_dllist_item entries;
  } rule_t;
--- 
-2.42.0
-
diff --git a/shadowsocksr-libev/src/server/server.c b/shadowsocksr-libev/src/server/server.c
index 65b0e42a8..18d47fb92 100644
--- a/shadowsocksr-libev/src/server/server.c
+++ b/shadowsocksr-libev/src/server/server.c
@@ -1943,7 +1943,7 @@ main(int argc, char **argv)
             memcpy(text, protocol, strlen(protocol) - 11);
             int length = strlen(protocol) - 11;
             free(protocol);
-            obfs = (char*)malloc(length);
+            protocol = (char*)malloc(length);
             memset(protocol, 0x00, length);
             memcpy(protocol, text, length);
             LOGI("protocol compatible enable, %s", protocol);