summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Lioncash2018-11-14 01:04:38 -0500
committerGravatar Lioncash2018-11-14 12:53:39 -0500
commitb4f63db04e5d686b2f88e040e9524cfc24d0a34e (patch)
treeb9c3c3fadb6aa1b1b27a9b8349c3ff6baa47770f /src/core
parentMerge pull request #1628 from greggameplayer/Texture2DArray (diff)
downloadyuzu-b4f63db04e5d686b2f88e040e9524cfc24d0a34e.tar.gz
yuzu-b4f63db04e5d686b2f88e040e9524cfc24d0a34e.tar.xz
yuzu-b4f63db04e5d686b2f88e040e9524cfc24d0a34e.zip
nfp: Correct erroneous sizeof expression within GetTagInfo()
The previous expression would copy sizeof(size_t) amount of bytes (8 on a 64-bit platform) rather than the full 10 bytes comprising the uuid member. Given the source and destination types are the same, we can just use an assignment here instead.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/nfp/nfp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp
index c1af878fe..1d6e7756f 100644
--- a/src/core/hle/service/nfp/nfp.cpp
+++ b/src/core/hle/service/nfp/nfp.cpp
@@ -212,7 +212,7 @@ private:
212 IPC::ResponseBuilder rb{ctx, 2}; 212 IPC::ResponseBuilder rb{ctx, 2};
213 auto amiibo = nfp_interface.GetAmiiboBuffer(); 213 auto amiibo = nfp_interface.GetAmiiboBuffer();
214 TagInfo tag_info{}; 214 TagInfo tag_info{};
215 std::memcpy(tag_info.uuid.data(), amiibo.uuid.data(), sizeof(tag_info.uuid.size())); 215 tag_info.uuid = amiibo.uuid;
216 tag_info.uuid_length = static_cast<u8>(tag_info.uuid.size()); 216 tag_info.uuid_length = static_cast<u8>(tag_info.uuid.size());
217 217
218 tag_info.protocol = 1; // TODO(ogniK): Figure out actual values 218 tag_info.protocol = 1; // TODO(ogniK): Figure out actual values