rik/jlibcom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SF 1690420 make memcpy calculate buffer length with sizeof()

Browse Source
This commit is contained in:
clay_shooter
2007-03-31 21:48:24 +00:00
parent fcbae0a84f
commit 7428d6590a
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jni/Variant.cpp
View File

@@ -656,7 +656,7 @@ JNIEXPORT jlong JNICALL Java_com_jacob_com_Variant_getVariantCurrency
CY cy;
cy = V_CY(v);
jlong jl;
memcpy(&jl, &cy, 8); // was 64. should be sizeof(x) SF 1689061
memcpy(&jl, &cy, sizeof(jl)); // was 64. should be sizeof(x) SF 1690420
return jl;
}
return NULL;
@@ -683,7 +683,7 @@ JNIEXPORT void JNICALL Java_com_jacob_com_Variant_putVariantCurrencyRef
if (v) {
VariantClear(v); // whatever was there before
CY *pf = (CY *)CoTaskMemAlloc(sizeof(CY));
memcpy(pf, &cur, 8); // was 64. should be sizeof(x) SF 1689061
memcpy(pf, &cur, sizeof(*pf)); // was 64. should be sizeof(x) SF 1690420
V_VT(v) = VT_BYREF|VT_CY;
V_CYREF(v) = pf;
}
@@ -795,7 +795,7 @@ JNIEXPORT jlong JNICALL Java_com_jacob_com_Variant_getVariantCurrencyRef
CY *cy;
cy = V_CYREF(v);
jlong jl;
memcpy(&jl, cy, 8); // was 64. should be sizeof(x) SF 1689061
memcpy(&jl, cy, sizeof(jl)); // was 64. should be sizeof(x) SF 1690420
return jl;
}
return NULL;