mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix detection of reallocarray

Browse source 
Fix detection of reallocarray (e.g. on glibc) raised since commit
0708a39b43

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
This commit is contained in:
Fabrice Fontaine 2022-05-27 15:00:17 +02:00 • committed by Wim Taymans
parent 63d2102594
commit 85ca67b927
13 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/module-client-node/client-node.c
View file

@ -191,7 +191,7 @@ static int update_params(struct params *p, uint32_t n_params, const struct spa_p
p->params = NULL;
} else {
struct spa_pod **np;
np = reallocarray(p->params, p->n_params, sizeof(struct spa_pod *));
np = pw_reallocarray(p->params, p->n_params, sizeof(struct spa_pod *));
if (np == NULL) {
pw_log_error("%p: can't realloc: %m", p);
free(p->params);

4
src/modules/module-client-node/remote-node.c
View file

@ -318,7 +318,7 @@ static int add_node_update(struct node_data *data, uint32_t change_mask, uint32_
id, &idx, NULL, &param, &b.b);
if (res == 1) {
void *p;
p = reallocarray(params, n_params + 1, sizeof(struct spa_pod *));
p = pw_reallocarray(params, n_params + 1, sizeof(struct spa_pod *));
if (p == NULL) {
res = -errno;
pw_log_error("realloc failed: %m");
@ -384,7 +384,7 @@ static int add_port_update(struct node_data *data, struct pw_impl_port *port, ui
id, &idx, NULL, &param, &b.b);
if (res == 1) {
void *p;
p = reallocarray(params, n_params + 1, sizeof(struct spa_pod*));
p = pw_reallocarray(params, n_params + 1, sizeof(struct spa_pod*));
if (p == NULL) {
res = -errno;
pw_log_error("realloc failed: %m");

4
src/modules/module-client-node/v0/client-node.c
View file

@ -476,7 +476,7 @@ do_update_port(struct node *this,
port->params = NULL;
} else {
void *p;
p = reallocarray(port->params, port->n_params, sizeof(struct spa_pod *));
p = pw_reallocarray(port->params, port->n_params, sizeof(struct spa_pod *));
if (p == NULL) {
pw_log_error("%p: port %u can't realloc: %m", this, port_id);
free(port->params);
@ -1049,7 +1049,7 @@ client_node0_update(void *data,
this->params = NULL;
} else {
void *p;
p = reallocarray(this->params, this->n_params, sizeof(struct spa_pod *));
p = pw_reallocarray(this->params, this->n_params, sizeof(struct spa_pod *));
if (p == NULL) {
pw_log_error("%p: can't realloc: %m", this);
free(this->params);