diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2018-05-29 10:25:05 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2018-05-29 10:27:32 -0700 |
| commit | 5bf35ecca2c2f3863788d0e551a633c42a2b51ff (patch) | |
| tree | ab1f41f7412f7b52863314397d49a1da2cc016f2 | |
| parent | edaaea01f69cb9927813a5fe55093b8faacebb97 (diff) | |
| download | protobuf-5bf35ecca2c2f3863788d0e551a633c42a2b51ff.tar.gz protobuf-5bf35ecca2c2f3863788d0e551a633c42a2b51ff.tar.bz2 protobuf-5bf35ecca2c2f3863788d0e551a633c42a2b51ff.zip | |
Fix php memory leak test (#4692)
| -rw-r--r-- | php/ext/google/protobuf/def.c | 1 | ||||
| -rw-r--r-- | php/tests/memory_leak_test.php | 21 |
2 files changed, 18 insertions, 4 deletions
diff --git a/php/ext/google/protobuf/def.c b/php/ext/google/protobuf/def.c index cb2c7201..fa33830b 100644 --- a/php/ext/google/protobuf/def.c +++ b/php/ext/google/protobuf/def.c @@ -773,6 +773,7 @@ static size_t classname_len_max(const char *fullname, static bool is_reserved(const char *segment, int length) { bool result; char* lower = ALLOC_N(char, length + 1); + memset(lower, 0, length + 1); memcpy(lower, segment, length); int i = 0; while(lower[i]) { diff --git a/php/tests/memory_leak_test.php b/php/tests/memory_leak_test.php index 5456919b..4e3874b7 100644 --- a/php/tests/memory_leak_test.php +++ b/php/tests/memory_leak_test.php @@ -4,11 +4,19 @@ require_once('generated/NoNamespaceEnum.php'); require_once('generated/NoNamespaceMessage.php'); -require_once('generated/NoNamespaceMessage_NestedEnum.php'); +require_once('generated/NoNamespaceMessage/NestedEnum.php'); +require_once('generated/NoNamespaceMessage/NestedMessage.php'); require_once('generated/PrefixEmpty.php'); require_once('generated/PrefixTestPrefix.php'); +require_once('generated/PrefixTestPrefix/PrefixNestedEnum.php'); +require_once('generated/PrefixTestPrefix/PrefixNestedMessage.php'); require_once('generated/TestEmptyNamespace.php'); +require_once('generated/TestEmptyNamespace/NestedEnum.php'); +require_once('generated/TestEmptyNamespace/NestedMessage.php'); require_once('generated/Bar/TestInclude.php'); +require_once('generated/Bar/TestLegacyMessage.php'); +require_once('generated/Bar/TestLegacyMessage/NestedEnum.php'); +require_once('generated/Bar/TestLegacyMessage/NestedMessage.php'); require_once('generated/Foo/PBARRAY.php'); require_once('generated/Foo/PBEmpty.php'); require_once('generated/Foo/TestEnum.php'); @@ -26,12 +34,17 @@ require_once('generated/Foo/TestUnpackedMessage.php'); require_once('generated/Foo/testLowerCaseMessage.php'); require_once('generated/Foo/testLowerCaseEnum.php'); require_once('generated/GPBMetadata/Proto/Test.php'); -require_once('generated/GPBMetadata/Proto/TestEmptyPhpNamespace.php'); +require_once('generated/TestEmptyPhpNamespace.php'); require_once('generated/GPBMetadata/Proto/TestInclude.php'); -require_once('generated/GPBMetadata/Proto/TestNoNamespace.php'); -require_once('generated/GPBMetadata/Proto/TestPhpNamespace.php'); +require_once('generated/TestNoNamespace.php'); +require_once('generated/Metadata/Php/Test/TestPhpNamespace.php'); require_once('generated/GPBMetadata/Proto/TestPrefix.php'); require_once('generated/Php/Test/TestNamespace.php'); +require_once('generated/Php/Test/TestNamespace/PBEmpty.php'); +require_once('generated/Php/Test/TestNamespace/PBEmpty/NestedEnum.php'); +require_once('generated/Php/Test/TestNamespace/PBEmpty/NestedMessage.php'); +require_once('generated/Php/Test/TestNamespace/NestedEnum.php'); +require_once('generated/Php/Test/TestNamespace/NestedMessage.php'); require_once('test_util.php'); use Google\Protobuf\Internal\RepeatedField; |