Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed data loss bug in PHP C extension #9450

Merged
merged 2 commits into from
Jan 28, 2022
Merged

Fixed data loss bug in PHP C extension #9450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67995fb
Fixed data loss bug with PHP C extension.
haberman Jan 28, 2022
35a21c1
Added CHANGES.txt entry.
haberman Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
Python
* Make libprotobuf symbols local on OSX to fix issue #9395 (#9435)

PHP
* Fixed a data loss bug that could occur when the number of `optional`
fields in a message is an exact multiple of 32. (#9440).

2022-01-10 version 3.19.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)

Python
Expand Down
2 changes: 1 addition & 1 deletion php/ext/google/protobuf/php-upb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5968,7 +5968,7 @@ static void make_layout(symtab_addctx *ctx, const upb_msgdef *m) {
}

/* Account for space used by hasbits. */
l->size = div_round_up(hasbit, 8);
l->size = div_round_up(hasbit + 1, 8);

/* Allocate non-oneof fields. */
for (upb_msg_field_begin(&it, m); !upb_msg_field_done(&it);
Expand Down
10 changes: 10 additions & 0 deletions php/tests/GeneratedClassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Bar\TestLegacyMessage;
use Bar\TestLegacyMessage_NestedEnum;
use Bar\TestLegacyMessage_NestedMessage;
use Foo\Test32Fields;
use Foo\TestEnum;
use Foo\TestIncludeNamespaceMessage;
use Foo\TestIncludePrefixMessage;
Expand Down Expand Up @@ -1849,4 +1850,13 @@ public function testNoExceptionWithVarDump()

$this->assertTrue(true);
}

public function testIssue9440()
{
$m = new Test32Fields();
$m->setId(8);
$this->assertEquals(8, $m->getId());
$m->setVersion('1');
$this->assertEquals(8, $m->getId());
}
}
35 changes: 35 additions & 0 deletions php/tests/proto/test.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,3 +306,38 @@ message TestBytesValue {
int32 int32_field = 4;
}
}

message Test32Fields {
optional uint32 id = 1;
optional uint32 random_name_a0 = 2;
optional uint32 random_name_a1 = 3;
optional uint32 random_name_a2 = 4;
optional uint32 random_name_a3 = 5;
optional uint32 random_name_a4 = 6;
optional uint32 random_name_a5 = 7;
optional uint32 random_name_a6 = 8;
optional uint32 random_name_a7 = 9;
optional uint32 random_name_a8 = 10;
optional uint32 random_name_a9 = 11;
optional uint32 random_name_b0 = 12;
optional uint32 random_name_b1 = 13;
optional uint32 random_name_b2 = 14;
optional uint32 random_name_b3 = 15;
optional uint32 random_name_b4 = 16;
optional uint32 random_name_b5 = 17;
optional uint32 random_name_b6 = 18;
optional uint32 random_name_b7 = 19;
optional uint32 random_name_b8 = 20;
optional uint32 random_name_b9 = 21;
optional uint32 random_name_c0 = 22;
optional uint32 random_name_c1 = 23;
optional uint32 random_name_c2 = 24;
optional uint32 random_name_c3 = 25;
optional uint32 random_name_c4 = 26;
optional uint32 random_name_c5 = 27;
optional uint32 random_name_c6 = 28;
optional uint32 random_name_c7 = 29;
optional uint32 random_name_c8 = 30;
optional uint32 random_name_c9 = 31;
optional string version = 32;
}