File 0001-ruby-return-0-from-shared_convert.c-shared... of Package rubygem-google-protobuf

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-ruby-return-0-from-shared_convert.c-shared_message.c.patch of Package rubygem-google-protobuf (Revision b50fda329cae039ebb42663adcecfaa2)

Currently displaying revision b50fda329cae039ebb42663adcecfaa2 , Show latest

From ac8bf15063bbd83d5f795816a933b5ff4774368b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 20 Nov 2023 10:48:31 +0100
Subject: [PATCH] ruby: return 0 from shared_convert.c & shared_message.c in
 failure cases

Functions declared as returning a value must return a value, otherwise the
return value is undefined.
This fixes building protobuf with -Werror=return-type
---
 ruby/ext/google/protobuf_c/shared_convert.c | 2 ++
 ruby/ext/google/protobuf_c/shared_message.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ruby/ext/google/protobuf_c/shared_convert.c b/ruby/ext/google/protobuf_c/shared_convert.c
index d3b78e3df..8337f6e2a 100644
--- a/ruby/ext/google/protobuf_c/shared_convert.c
+++ b/ruby/ext/google/protobuf_c/shared_convert.c
@@ -35,6 +35,7 @@ bool shared_Msgval_IsEqual(upb_MessageValue val1, upb_MessageValue val2,
       return shared_Message_Equal(val1.msg_val, val2.msg_val, msgdef, status);
     default:
       upb_Status_SetErrorMessage(status, "Internal error, unexpected type");
+      return 0;
   }
 }
 
@@ -60,5 +61,6 @@ uint64_t shared_Msgval_GetHash(upb_MessageValue val, upb_CType type,
       return shared_Message_Hash(val.msg_val, msgdef, seed, status);
     default:
       upb_Status_SetErrorMessage(status, "Internal error, unexpected type");
+      return 0;
   }
 }
\ No newline at end of file
diff --git a/ruby/ext/google/protobuf_c/shared_message.c b/ruby/ext/google/protobuf_c/shared_message.c
index 9e650c3c3..a0d640887 100644
--- a/ruby/ext/google/protobuf_c/shared_message.c
+++ b/ruby/ext/google/protobuf_c/shared_message.c
@@ -32,6 +32,7 @@ uint64_t shared_Message_Hash(const upb_Message* msg, const upb_MessageDef* m,
   } else {
     upb_Arena_Free(arena);
     upb_Status_SetErrorMessage(status, "Error calculating hash");
+    return 0;
   }
 }
 
@@ -61,5 +62,6 @@ bool shared_Message_Equal(const upb_Message* m1, const upb_Message* m2,
   } else {
     upb_Arena_Free(arena_tmp);
     upb_Status_SetErrorMessage(status, "Error comparing messages");
+    return 0;
   }
 }
-- 
2.42.0

Places

File 0001-ruby-return-0-from-shared_convert.c-shared_message.c.patch of Package rubygem-google-protobuf (Revision b50fda329cae039ebb42663adcecfaa2)

Places