livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace hardcoded 16 with UUID_BYTES where apropriate (Nat gets sad from hardcoded 16).

meow-7.2.2
Nicky 2018-04-03 22:06:45 +02:00
parent 4e598848f6
commit b96bd81ff5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llmessage/partsyspacket.cpp
View File

@ -574,7 +574,7 @@ U32 LLPartSysCompressedPacket::writeUUID(LLPartInitData *in, U32 startByte)
mData[startByte++] = 0x00; // flag for "read whole UUID"
memcpy(bufPtr, in->mImageUuid.mData, 16); /* Flawfinder: ignore */
memcpy( bufPtr, in->mImageUuid.mData, UUID_BYTES ); /* Flawfinder: ignore */
return (startByte+16);
}
@ -936,8 +936,8 @@ U32 LLPartSysCompressedPacket::readUUID(LLPartInitData *in, U32 startByte)
}
startByte++; // cause we actually have to read the UUID now.
memcpy(in->mImageUuid.mData, bufPtr, 16); /* Flawfinder: ignore */
return (startByte+16);
memcpy( in->mImageUuid.mData, bufPtr, UUID_BYTES ); /* Flawfinder: ignore */
return (startByte + UUID_BYTES);
}

12
indra/llprimitive/llprimitive.cpp
View File

@ -1140,7 +1140,7 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const
const LLTextureEntry &te = getTEref( face_index );
// Directly sending image_ids is not safe!
memcpy(&image_ids[face_index*16], te.getID().mData,16); /* Flawfinder: ignore */
memcpy( &image_ids[ face_index*UUID_BYTES ], te.getID().mData, UUID_BYTES ); /* Flawfinder: ignore */
// Cast LLColor4 to LLColor4U
coloru.setVec( te.getColor() );
@ -1163,7 +1163,7 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const
glow[face_index] = (U8) ll_round((llclamp(te.getGlow(), 0.0f, 1.0f) * (F32)0xFF));
// Directly sending material_ids is not safe!
memcpy(&material_data[face_index*16],te.getMaterialID().get(),16); /* Flawfinder: ignore */
memcpy( &material_data[ face_index * UUID_BYTES ], te.getMaterialID().get(), UUID_BYTES ); /* Flawfinder: ignore */
}
cur_ptr += packTEField(cur_ptr, (U8 *)image_ids, sizeof(LLUUID),last_face_index, MVT_LLUUID);
@ -1225,7 +1225,7 @@ BOOL LLPrimitive::packTEMessage(LLDataPacker &dp) const
{
const LLTextureEntry &te = getTEref( face_index );
// Directly sending image_ids is not safe!
memcpy(&image_ids[face_index*16], te.getID().mData,16); /* Flawfinder: ignore */
memcpy( &image_ids[ face_index*UUID_BYTES ], te.getID().mData, UUID_BYTES ); /* Flawfinder: ignore */
// Cast LLColor4 to LLColor4U
coloru.setVec( te.getColor() );
@ -1248,7 +1248,7 @@ BOOL LLPrimitive::packTEMessage(LLDataPacker &dp) const
glow[face_index] = (U8) ll_round((llclamp(te.getGlow(), 0.0f, 1.0f) * (F32)0xFF));
// Directly sending material_ids is not safe!
memcpy(&material_data[face_index*16],te.getMaterialID().get(),16); /* Flawfinder: ignore */
memcpy( &material_data[ face_index*UUID_BYTES ], te.getMaterialID().get(), UUID_BYTES ); /* Flawfinder: ignore */
}
cur_ptr += packTEField(cur_ptr, (U8 *)image_ids, sizeof(LLUUID),last_face_index, MVT_LLUUID);
@ -1470,8 +1470,8 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp)
for (i = 0; i < face_count; i++)
{
memcpy(image_ids[i].mData,&image_data[i*16],16); /* Flawfinder: ignore */
material_ids[i].set(&material_data[i * 16]);
memcpy( image_ids[ i ].mData, &image_data[ i*UUID_BYTES ], UUID_BYTES ); /* Flawfinder: ignore */
material_ids[ i ].set( &material_data[ i * UUID_BYTES ] );
}
LLColor4 color;