Add null checks to get_field

Author: FabioBatSilva

php/.gitignore

@@ -0,0 +1,9 @@
+ext/google/protobuf/Makefile
+ext/google/protobuf/configure
+ext/google/protobuf/BUILD_STAMP
+ext/google/protobuf/wkt.inc
+ext/google/protobuf/*.dep
+ext/google/protobuf/*.cache
+ext/google/protobuf/*.h.in
+tmp/
+

php/ext/google/protobuf/message.c

@@ -64,6 +64,8 @@ static zend_object* Message_create(zend_class_entry* class_type) {
   Message_SuppressDefaultProperties(class_type);
   zend_object_std_init(&intern->std, class_type);
   intern->std.handlers = &message_object_handlers;
+  intern->desc = NULL;
+
   Arena_Init(&intern->arena);
   return &intern->std;
 }
@@ -88,6 +90,56 @@ static void Message_dtor(zend_object* obj) {
  * Helper function to look up a field given a member name (as a string).
  */
 static const upb_FieldDef* get_field(Message* msg, zend_string* member) {
+  //fprintf(stderr, "get_field\n");
+
+  if (!msg || !msg->desc || !msg->desc->msgdef) {
+    // zend_string* class_name = msg ? msg->std.ce->name : NULL;
+    // zend_class_entry* parent_ce = msg && msg->std.ce->parent ? msg->std.ce->parent : NULL;
+
+    // fprintf(stderr,
+    //     "get_field: Invalid msg or desc: msg=%p, desc=%p\n",
+    //     (void*)msg, (void*)msg->desc
+    // );
+
+    // if (class_name) {
+    //     fprintf(stderr, "Class name: %s\n", ZSTR_VAL(class_name));
+    // } else {
+    //     fprintf(stderr, "Class name: (null)\n");
+    // }
+
+    // if (parent_ce) {
+    //     fprintf(stderr, "Parent class: %s\n", ZSTR_VAL(parent_ce->name));
+    // } else {
+    //     fprintf(stderr, "Parent class: (none)\n");
+    // }
+
+    // // Print the full stack trace
+    // fprintf(stderr, "Full stack trace:\n");
+    // const zend_execute_data* frame = EG(current_execute_data);
+    // while (frame) {
+    //     const zend_function* func = frame->func;
+    //     const char* function_name = func->common.function_name
+    //                                     ? ZSTR_VAL(func->common.function_name)
+    //                                     : "(unknown)";
+    //     const char* class_name = func->common.scope
+    //                                     ? ZSTR_VAL(func->common.scope->name)
+    //                                     : "(none)";
+    //     const char* filename = func->op_array.filename
+    //                                ? ZSTR_VAL(func->op_array.filename)
+    //                                : "(unknown)";
+    //     uint32_t line = frame->opline ? frame->opline->lineno : 0;
+
+    //     fprintf(stderr, "  at %s::%s() in %s on line %u\n",
+    //             class_name, function_name, filename, line);
+
+    //     // Move to the previous frame
+    //     frame = frame->prev_execute_data;
+    // }
+
+    zend_throw_exception_ex(NULL, 0, "Message is uninitialized or corrupted.");
+    return NULL;
+  }
+
   const upb_MessageDef* m = msg->desc->msgdef;
   const upb_FieldDef* f = upb_MessageDef_FindFieldByNameWithSize(
       m, ZSTR_VAL(member), ZSTR_LEN(member));
@@ -345,6 +397,13 @@ static zval* Message_read_property(zend_object* obj, zend_string* member,
  */
 static zval* Message_write_property(zend_object* obj, zend_string* member,
                                     zval* val, void** cache_slot) {
+  // fprintf(
+  //     stderr,
+  //     "Message_write_property: obj->ce->name=%s, member=%s\n",
+  //     ZSTR_VAL(obj->ce->name),
+  //     ZSTR_VAL(member)
+  // );
+
   Message* intern = (Message*)obj;
   const upb_FieldDef* f = get_field(intern, member);
 

php/tests/extends_test.php

@@ -0,0 +1,39 @@
+<?php
+
+require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (__DIR__ . '/test_util.php');
+
+use Foo\TestMessage;
+
+class TestMessageProxy extends TestMessage
+{
+    private $foo;
+
+    public  function __construct($data = NULL) {
+        if (0 < func_num_args()) {
+            parent::__construct($data);
+        }
+    }
+
+    public function setFoo($foo) {
+        print("setFoo($foo)\n");
+        $this->foo = $foo;
+    }
+
+    public function getFoo() {
+        print("getFoo()\n");
+
+        return $this->foo;
+        //return 'bar';
+    }
+}
+
+$p = new TestMessageProxy();
+
+try {
+    $p->setFoo('bar');
+} catch (Exception $e) {
+    print("TraceAsString: " .  $e->getTraceAsString() . "\n");
+}
+
+assert('bar' === $p->getFoo());

php/tests/optional_test.php

@@ -0,0 +1,12 @@
+<?php
+
+require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (__DIR__ . '/test_util.php');
+
+use Foo\TestMessage;
+
+$m = new TestMessage([]);
+
+$m->setTrueOptionalString(null);
+
+var_dump($m->getTrueOptionalString());