Skip to content

Commit c903186

Browse files
authored
Merge pull request #22885 from moiseev/os-log-unshadow
[os_log] Un-shadow buffer so the correct copy happens
2 parents 3bc9ce1 + a0326f6 commit c903186

File tree

1 file changed

+4
-4
lines changed
  • stdlib/public/Darwin/os

1 file changed

+4
-4
lines changed

stdlib/public/Darwin/os/os.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
if (_os_log_encode(buf, fmt, args, saved_errno, &ob)) {
8888
if (os_log_pack_send) {
8989
size_t sz = _os_log_pack_size(ob.ob_len);
90-
uint8_t _Alignas(os_log_pack_s) buf[sz];
91-
os_log_pack_t p = (os_log_pack_t)buf;
90+
uint8_t _Alignas(os_log_pack_s) pack[sz];
91+
os_log_pack_t p = (os_log_pack_t)pack;
9292
/*
9393
* _os_log_encode has already packed `saved_errno` into a
9494
* OSLF_CMD_TYPE_SCALAR command as the OSLF_CMD_TYPE_ERRNO does not
@@ -136,8 +136,8 @@
136136
_os_log_encode(buf, fmt, args, saved_errno, &ob);
137137
if (encoded) {
138138
size_t sz = _os_log_pack_size(ob.ob_len);
139-
uint8_t _Alignas(os_log_pack_s) buf[sz];
140-
os_log_pack_t p = (os_log_pack_t)buf;
139+
uint8_t _Alignas(os_log_pack_s) pack[sz];
140+
os_log_pack_t p = (os_log_pack_t)pack;
141141
uint8_t *ptr = _os_signpost_pack_fill(p, sz, saved_errno, dso,
142142
fmt, spnm, spid);
143143
p->olp_pc = ra;

0 commit comments

Comments
 (0)