2
0
Эх сурвалжийг харах

Merge pull request #84155 from AThousandShips/encode_fix

Prevent `encode_variant` doing `memcpy` from `nullptr`
Rémi Verschelde 1 жил өмнө
parent
commit
a3e4c4f41c
1 өөрчлөгдсөн 4 нэмэгдсэн , 2 устгасан
  1. 4 2
      core/io/marshalls.cpp

+ 4 - 2
core/io/marshalls.cpp

@@ -1621,8 +1621,10 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
 				encode_uint32(datalen, buf);
 				buf += 4;
 				const uint8_t *r = data.ptr();
-				memcpy(buf, &r[0], datalen * datasize);
-				buf += datalen * datasize;
+				if (r) {
+					memcpy(buf, &r[0], datalen * datasize);
+					buf += datalen * datasize;
+				}
 			}
 
 			r_len += 4 + datalen * datasize;