mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-11-15 10:05:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed two possible int-overflows

Browse Source
This commit is contained in:
jkriege2 2022-04-21 13:59:49 +02:00
parent a24ad0b597
commit b4eda85bfc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jkqtcommon/jkqtpbasicimagetools.h
View File

@ -657,7 +657,7 @@ inline void JKQTPImagePlot_array2RGBimage(const T* dbl_in, int width, int height
T* dbllog=nullptr; T* dbllog=nullptr;
if (logScale) { if (logScale) {
double logB=log10(logBase); double logB=log10(logBase);
dbllog=static_cast<T*>(malloc(width*height*sizeof(T))); dbllog=static_cast<T*>(malloc(static_cast<size_t>(width)*static_cast<size_t>(height)*sizeof(T)));
//memcpy(dbl, dbl_in, width*height*sizeof(T)); //memcpy(dbl, dbl_in, width*height*sizeof(T));
for (int i=0; i<width*height; i++) { for (int i=0; i<width*height; i++) {
dbllog[i]=log10(dbl_in[i])/logB; dbllog[i]=log10(dbl_in[i])/logB;

2
lib/jkqtplotter/graphs/jkqtpcontour.cpp
View File

@ -63,7 +63,7 @@ void JKQTPContourPlot::draw(JKQTPEnhancedPainter &painter)
int64_t colChecksum=-1; int64_t colChecksum=-1;
if (data && Nx*Ny>0) { if (data && Nx*Ny>0) {
colChecksum=static_cast<int64_t>(qChecksum(reinterpret_cast<const char*>(data), Nx*Ny* getSampleSize()/sizeof(char))); colChecksum=static_cast<int64_t>(qChecksum(reinterpret_cast<const char*>(data), static_cast<int64_t>(Nx)*static_cast<int64_t>(Ny)* static_cast<int64_t>(getSampleSize()/sizeof(char))));
} }
/*if (parent && parent->getDatastore() && imageColumn>=0) { /*if (parent && parent->getDatastore() && imageColumn>=0) {
colChecksum=static_cast<int64_t>(parent->getDatastore()->getColumnChecksum(imageColumn)); colChecksum=static_cast<int64_t>(parent->getDatastore()->getColumnChecksum(imageColumn));