fix _z_bytes_move to account for aliased vector

DenisBiryukov91 · Feb 27, 2025 · 6c4e272 · 6c4e272
1 parent b2e97d6
commit 6c4e272
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/collections/bytes.c b/src/collections/bytes.c
@@ -163,6 +163,12 @@ _z_slice_t _z_bytes_try_get_contiguous(const _z_bytes_t *bs) {
 }
 
 z_result_t _z_bytes_move(_z_bytes_t *dst, _z_bytes_t *src) {
+    if (src->_slices._aliased) {
+        *dst = _z_bytes_null();
+        _z_bytes_t csrc;
+        _Z_RETURN_IF_ERR(_z_arc_slice_svec_copy(&csrc._slices, &src->_slices, false));
+        *src = csrc;
+    }
     *dst = *src;
     *src = _z_bytes_null();
     return _Z_RES_OK;

diff --git a/src/net/sample.c b/src/net/sample.c
@@ -20,9 +20,9 @@ z_result_t _z_sample_move(_z_sample_t *dst, _z_sample_t *src) {
     *dst = _z_sample_null();
     _Z_RETURN_IF_ERR(_z_keyexpr_move(&dst->keyexpr, &src->keyexpr));
     _Z_CLEAN_RETURN_IF_ERR(_z_encoding_move(&dst->encoding, &src->encoding), _z_sample_clear(dst));
-    _z_bytes_move(&dst->payload, &src->payload);
+    _Z_CLEAN_RETURN_IF_ERR(_z_bytes_move(&dst->payload, &src->payload), _z_sample_clear(dst));
+    _Z_CLEAN_RETURN_IF_ERR(_z_bytes_move(&dst->attachment, &src->attachment), _z_sample_clear(dst));
     _z_timestamp_move(&dst->timestamp, &src->timestamp);
-    _z_bytes_move(&dst->attachment, &src->attachment);
     dst->qos = src->qos;
     dst->reliability = src->reliability;
     dst->kind = src->kind;

diff --git a/src/protocol/core.c b/src/protocol/core.c
@@ -85,7 +85,8 @@ z_result_t _z_hello_move(_z_hello_t *dst, _z_hello_t *src) {
 }
 
 z_result_t _z_value_move(_z_value_t *dst, _z_value_t *src) {
-    _z_bytes_move(&dst->payload, &src->payload);
+    *dst = _z_value_null();
+    _Z_RETURN_IF_ERR(_z_bytes_move(&dst->payload, &src->payload));
     _Z_CLEAN_RETURN_IF_ERR(_z_encoding_move(&dst->encoding, &src->encoding), _z_value_clear(dst));
     return _Z_RES_OK;
 }