Commit Graph

7005 Commits

Author SHA1 Message Date
Jon Skeet
aa22aa32f3 Fix Makefile.am by adding generated files 2019-11-04 16:35:38 +00:00
Jan Tattermusch
9417a310d3
Merge pull request #6824 from jskeet/fix-extensions
Fix reflection access when using old generated code
2019-11-04 14:12:06 +01:00
Jan Tattermusch
61d75cb8ec
Merge pull request #6826 from jskeet/fix-custom-options
Avoid NullReferenceException when accessing CustomOptions
2019-11-04 14:06:00 +01:00
veawor
129a7c875f Make shared libraries be able to link to MSVC static runtime libraries, so that VC runtime is not required. 2019-10-30 16:31:05 -07:00
Jon Skeet
7282f29ced Avoid NullReferenceException when accessing CustomOptions
Even though the property is deprecated, it still shouldn't throw.
2019-10-30 11:59:09 +00:00
Jon Skeet
9b5fdb0938 Ignore incomplete extensions when building a FileDescriptor
FileDescriptor construction uses an extension registry including extensions from imports. If these were created using an older version of protoc, the FieldDescriptor.Extension property may be null; we ignore such extensions rather than failing.
2019-10-30 09:47:45 +00:00
Jon Skeet
7581fd5ea6 Tests for issue 6822
(The implementation to fix this is in the following commit.)
2019-10-30 09:46:24 +00:00
Jon Skeet
e613ba6980 Add braces around single-statement if/foreach 2019-10-30 09:45:00 +00:00
Adam Cozzette
403df1d047 Added a descriptor option number for ocaml-protoc-plugin 2019-10-29 14:34:50 -07:00
Paul Yang
c53e5b8e11
Avoid too much overhead in layout_init (#6716)
* Avoid initializing primitive fields in layout_init

* Avoid initializing string/bytes/message fields in layout_init

* Lazily create map when needed

* Lazily create repeated fields

* Change layout_init to only do memcpy

* Fix test for php-7.0

* Fix conformance test where default value of string/message map is not encoded

* Fix test for zts

* Clean up

* Fix comments
2019-10-29 12:48:24 -07:00
Rafi Kamal
3fa17ca0bd
Merge pull request #6811 from elharo/guava
Update GSON and errorprone
2019-10-29 11:49:09 -07:00
Tapasweni Pathak
7ce420298a fix one more line 2019-10-29 11:43:49 -07:00
Tapasweni Pathak
50fb80cdd8 fix check for undefined behavior 2019-10-29 11:43:49 -07:00
Tapasweni Pathak
fbbbc45ae5 address review 2019-10-29 11:43:49 -07:00
Tapasweni Pathak
a971a4ef1f Fix: Undefined behavior in UTF8GenericScanFastAscii 2019-10-29 11:43:49 -07:00
Rafi Kamal
620d8fb287
Merge pull request #6810 from elharo/patch-6
Update to 3.10.0 in docs
2019-10-29 11:37:06 -07:00
ST-DDT
4252b7aff3 Fix broken javadoc generation for repeated enum values 2019-10-28 16:29:14 -07:00
Yannic
fc7c65a258 Update six.BUILD 2019-10-28 16:28:41 -07:00
Yannic
3581ee24e9 Update six.BUILD 2019-10-28 16:28:41 -07:00
Yannic
e907a8781d Update protobuf_deps.bzl 2019-10-28 16:28:41 -07:00
Yannic Bonenberger
29d650aefb [bazel] Add strip_prefix to download of @six
This way, we can avoid an unnecessary copy.
2019-10-28 16:28:41 -07:00
Elliotte Rusty Harold
906b57475d merge 2019-10-28 07:11:14 -04:00
Elliotte Rusty Harold
ed69e88695 update error_prone and gson 2019-10-28 07:09:46 -04:00
Elliotte Rusty Harold
939a6f5de6
Merge pull request #1 from protocolbuffers/master
merge
2019-10-28 07:03:44 -04:00
Elliotte Rusty Harold
82db4520a1
Update to 3.10.0 in docs 2019-10-28 06:57:39 -04:00
Rafi Kamal
342a2d627c
Merge pull request #6752 from rafi-kamal/201910111201
Down integrate Google3 changes to Github
2019-10-24 12:03:05 -07:00
Rafi Kamal
5e6d57bd8c Merge branch '201910111201' of https://github.com/rafi-kamal/protobuf into 201910111201 2019-10-23 17:46:09 -07:00
Rafi Kamal
80734b2e1a Reverted changes in conformance/failure_list_js.txt 2019-10-23 17:45:23 -07:00
Christian Maurer
2fc88527e0 c++ remove warning switch contains default but no case 2019-10-23 14:49:28 -07:00
Rafi Kamal
3f4f315266
Merge pull request #6783 from suztomo/install_bom
Installing BOM before running Java test
2019-10-23 12:32:34 -07:00
Rafi Kamal
c0acff1c4e
Merge pull request #6786 from donaldchai/master
Add com.google.truth as test dependencies
2019-10-23 11:40:15 -07:00
Donald Chai
175ddfc175 Add com.google.truth as test dependencies
This goes hand-in-hand with other dependencies like junit, but seems to
only have been used from util/pom.xml.
2019-10-22 20:03:51 -07:00
Tomo Suzuki
ca25badcbe Installing BOM before running Java test 2019-10-22 13:42:35 -04:00
Jan Tattermusch
c08b7512cf
Merge pull request #6759 from ObsidianMinor/csharp/extension-length-checks
Add length checks to ExtensionCollection
2019-10-22 08:24:43 +02:00
Christian Maurer
912d8195da c++ remove unused parameters 2019-10-18 16:31:26 -07:00
Christian Maurer
6f0f382d56 c++ remove conversion warning in MapEntryFuncs::ByteSizeLong 2019-10-18 16:30:02 -07:00
woegster
b467aa1614 more potential windows macro redefinition 2019-10-18 15:40:15 -07:00
woegster
bba24bcb6b avoid c++ macro redifitnion on windows 2019-10-18 15:40:15 -07:00
Daniel Johansen
e93dea7746 update Cmake example to build Visual Studio to newest 2019 version. 2019-10-18 15:39:20 -07:00
Jan Tattermusch
2f7f670134
Merge pull request #6530 from prat0088/csharp-ensuresize
c# feature(RepeatedField): Capacity property to resize the internal array
2019-10-18 17:35:12 +02:00
Joshua Haberman
77646a45e2
Merge pull request #6758 from XrXr/ub
Remove unused argument to avoid UB
2019-10-15 23:41:29 -07:00
debugx
9fdb2cf2bb fixed typo 2019-10-15 12:05:14 -07:00
Juraj Lutter
982222e71a Include cmath instead of math.h
This fixes build on, at least, NetBSD 8.1 with gcc 5.5 and SmartOS with gcc 7.
2019-10-15 12:03:08 -07:00
Rafi Kamal
3a505c2ded
Merge pull request #6744 from elharo/patch-5
Java: Update to Guava 28.1-android
2019-10-15 09:00:06 -07:00
Rafi Kamal
e249134eb8
Merge pull request #6756 from haberman/ruby-empty-names
Fixed bug in Ruby DSL when no names are defined in a file.
2019-10-14 10:55:00 -07:00
Rafi Kamal
bf36d04348
Merge pull request #6757 from haberman/ruby-empty-names-release
Ported names fix for Ruby to the release branch.
2019-10-13 22:24:38 -07:00
Sydney Acksman
f50bc62feb Add length checks to ExtensionCollection 2019-10-11 20:23:07 -05:00
Alan Wu
c1ba7c643c Remove unused argument to avoid UB
`OneOfDescriptor_each` is registered as a Ruby method which takes zero
parameters, which means it should take one argument.

When Ruby invokes `OneOfDescriptor_each`, it calls it with one parameter
only, which is one less than what `OneOfDescriptor_each` takes before
this commit. Calling a function with the wrong number of argument is
technically undefined behavior.

See also: §6.5.2.2, N1256
2019-10-11 20:32:35 -04:00
Joshua Haberman
35da84bf64 Ported names fix for Ruby to the release branch. 2019-10-11 14:52:08 -07:00
Joshua Haberman
09a8639482 Fixed bug in Ruby DSL when no names are defined in a file. 2019-10-11 14:22:34 -07:00