mmo-ref/dep-protobuf
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf synced 2026-08-26 02:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle refcount issues on allocation failure in python

Browse source 
PiperOrigin-RevId: 968724072
This commit is contained in:
Protobuf Team Bot 2026-08-21 15:28:13 -07:00 • committed by Copybara-Service
parent bf50167a85
commit 2901ce6db3
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
python/unknown_fields.c
View file

@ -7,10 +7,14 @@
#include "python/unknown_fields.h"
#include <assert.h>
#include <stdint.h>
#include "python/message.h"
#include "python/protobuf.h"
#include "upb/base/string_view.h"
#include "upb/message/message.h"
#include "upb/reflection/def.h"
#include "upb/wire/eps_copy_input_stream.h"
#include "upb/wire/reader.h"
#include "upb/wire/types.h"
@ -36,7 +40,14 @@ PyUpb_UnknownFieldSet* PyUpb_UnknownFieldSet_NewBare(void) {
PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
PyUpb_UnknownFieldSet* self =
(void*)PyType_GenericAlloc(s->unknown_fields_type, 0);
if (!self) {
return NULL;
}
self->fields = PyList_New(0);
if (!self->fields) {
Py_DECREF(self);
return NULL;
}
return self;
}
@ -108,8 +119,9 @@ done:
PyObject* field = PyObject_CallFunction(
s->unknown_field_type, "iiO", type_id, kUpb_WireType_Delimited, msg);
if (!field) goto err;
PyList_Append(self->fields, field);
bool appended = PyList_Append(self->fields, field) != -1;
Py_DECREF(field);
if (!appended) goto err;
}
Py_XDECREF(msg);
return ptr;
@ -137,7 +149,7 @@ static const char* PyUpb_UnknownFieldSet_BuildMessageSet(
return ptr;
err:
Py_DECREF(self->fields);
Py_CLEAR(self->fields);
return NULL;
}
@ -220,14 +232,21 @@ static const char* PyUpb_UnknownFieldSet_Build(PyUpb_UnknownFieldSet* self,
assert(data);
PyObject* field = PyObject_CallFunction(s->unknown_field_type, "iiN",
field_number, wire_type, data);
PyList_Append(self->fields, field);
if (!field) {
Py_DECREF(data);
goto err;
}
bool appended = PyList_Append(self->fields, field) != -1;
Py_DECREF(field);
if (!appended) {
goto err;
}
}
if (upb_EpsCopyInputStream_IsError(stream)) goto err;
return ptr;
err:
Py_DECREF(self->fields);
Py_CLEAR(self->fields);
return NULL;
}