diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-07-25 11:52:33 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-25 11:52:33 -0700 |
| commit | 759245a49a00315a41b28da8fe52a2894d4f57ea (patch) | |
| tree | 5a0032a1a3619a448d5301da131907ca8449730f /python/google/protobuf/pyext/repeated_composite_container.cc | |
| parent | 4bff88e0fb2338657a781eeee0c5362a57b57bf3 (diff) | |
Merge from master
Diffstat (limited to 'python/google/protobuf/pyext/repeated_composite_container.cc')
| -rw-r--r-- | python/google/protobuf/pyext/repeated_composite_container.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/google/protobuf/pyext/repeated_composite_container.cc b/python/google/protobuf/pyext/repeated_composite_container.cc index cb083c68..5ad71db5 100644 --- a/python/google/protobuf/pyext/repeated_composite_container.cc +++ b/python/google/protobuf/pyext/repeated_composite_container.cc @@ -270,10 +270,11 @@ int AssignSubscript(RepeatedCompositeContainer* self, if (PySlice_Check(slice)) { #if PY_MAJOR_VERSION >= 3 if (PySlice_GetIndicesEx(slice, + length, &from, &to, &step, &slicelength) == -1) { #else if (PySlice_GetIndicesEx(reinterpret_cast<PySliceObject*>(slice), -#endif length, &from, &to, &step, &slicelength) == -1) { +#endif return -1; } return PySequence_DelSlice(self->child_messages, from, to); |