X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-distro%2Frecipes-security%2Fgssproxy%2Ffiles%2FTolerate-NULL-pointers-in-gp_same.patch;fp=meta-starlingx%2Fmeta-stx-distro%2Frecipes-security%2Fgssproxy%2Ffiles%2FTolerate-NULL-pointers-in-gp_same.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=9f2a1473acc562e83376fc0da1d694df3d94a4c7;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-distro/recipes-security/gssproxy/files/Tolerate-NULL-pointers-in-gp_same.patch b/meta-starlingx/meta-stx-distro/recipes-security/gssproxy/files/Tolerate-NULL-pointers-in-gp_same.patch
deleted file mode 100644
index 9f2a147..0000000
--- a/meta-starlingx/meta-stx-distro/recipes-security/gssproxy/files/Tolerate-NULL-pointers-in-gp_same.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 05a2677920f0240ea302e67d699546665687dd14 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 13 Jun 2017 14:22:44 -0400
-Subject: [PATCH] Tolerate NULL pointers in gp_same
-
-Fixes potential NULL derefs of program names
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #195
-(cherry picked from commit afe4c2fe6f7f939df914959dda11131bd80ccec6)
----
- proxy/src/gp_util.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/proxy/src/gp_util.c b/proxy/src/gp_util.c
-index f158b84..5442992 100644
---- a/proxy/src/gp_util.c
-+++ b/proxy/src/gp_util.c
-@@ -12,10 +12,9 @@
- 
- bool gp_same(const char *a, const char *b)
- {
--    if ((a == b) || strcmp(a, b) == 0) {
-+    if (a == b || (a && b && strcmp(a, b) == 0)) {
-         return true;
-     }
--
-     return false;
- }
-