gwm17/implot
1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-11-22 18:28:53 -05:00
Code Issues Projects Releases Wiki Activity

Fix freed memory read error in AddTicksTime(). Invalid read occurred when LabelTickTime() resizes ticks.TextBuffer while last_major held pointer pointing into old now freed buffer. (#365)

Browse Source 
Fixed a warning about condition depending on uninitialized ImPlotLegend::PreviousLocation.
This commit is contained in:
Rokas Kupstys 2022-06-17 17:09:25 +03:00 committed by GitHub
parent b9c0a39b08
commit 79b05d5e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
implot.cpp
View File

@ -1154,7 +1154,7 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
// maximum allowable density of labels // maximum allowable density of labels
const float max_density = 0.5f; const float max_density = 0.5f;
// book keeping // book keeping
const char* last_major = NULL; int last_major_offset = -1;
if (unit0 != ImPlotTimeUnit_Yr) { if (unit0 != ImPlotTimeUnit_Yr) {
// pixels per major (level 1) division // pixels per major (level 1) division
const float pix_per_major_div = plot_width / (float)(range.Size() / TimeUnitSpans[unit1]); const float pix_per_major_div = plot_width / (float)(range.Size() / TimeUnitSpans[unit1]);
@ -1181,11 +1181,11 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
// major level 1 tick // major level 1 tick
ImPlotTick tick_maj(t1.ToDouble(),true,true); ImPlotTick tick_maj(t1.ToDouble(),true,true);
tick_maj.Level = 1; tick_maj.Level = 1;
LabelTickTime(tick_maj,ticks.TextBuffer,t1, last_major == NULL ? fmtf : fmt1); LabelTickTime(tick_maj,ticks.TextBuffer,t1, last_major_offset < 0 ? fmtf : fmt1);
const char* this_major = ticks.TextBuffer.Buf.Data + tick_maj.TextOffset; const char* this_major = ticks.TextBuffer.Buf.Data + tick_maj.TextOffset;
if (last_major && TimeLabelSame(last_major,this_major)) if (last_major_offset >= 0 && TimeLabelSame(ticks.TextBuffer.Buf.Data + last_major_offset, this_major))
tick_maj.ShowLabel = false; tick_maj.ShowLabel = false;
last_major = this_major; last_major_offset = tick_maj.TextOffset;
ticks.Append(tick_maj); ticks.Append(tick_maj);
} }
// add minor ticks up until next major // add minor ticks up until next major
@ -1198,11 +1198,11 @@ void AddTicksTime(const ImPlotRange& range, float plot_width, ImPlotTickCollecti
tick.Level = 0; tick.Level = 0;
LabelTickTime(tick,ticks.TextBuffer,t12,fmt0); LabelTickTime(tick,ticks.TextBuffer,t12,fmt0);
ticks.Append(tick); ticks.Append(tick);
if (last_major == NULL && px_to_t2 >= fmt0_width && px_to_t2 >= (fmt1_width + fmtf_width) / 2) { if (last_major_offset < 0 && px_to_t2 >= fmt0_width && px_to_t2 >= (fmt1_width + fmtf_width) / 2) {
ImPlotTick tick_maj(t12.ToDouble(),true,true); ImPlotTick tick_maj(t12.ToDouble(),true,true);
tick_maj.Level = 1; tick_maj.Level = 1;
LabelTickTime(tick_maj,ticks.TextBuffer,t12,fmtf); LabelTickTime(tick_maj,ticks.TextBuffer,t12,fmtf);
last_major = ticks.TextBuffer.Buf.Data + tick_maj.TextOffset; last_major_offset = tick_maj.TextOffset;
ticks.Append(tick_maj); ticks.Append(tick_maj);
} }
} }

2
implot_internal.h
View File

@ -887,7 +887,7 @@ struct ImPlotLegend
Flags = PreviousFlags = ImPlotLegendFlags_None; Flags = PreviousFlags = ImPlotLegendFlags_None;
CanGoInside = true; CanGoInside = true;
Hovered = Held = false; Hovered = Held = false;
Location = ImPlotLocation_NorthWest; Location = PreviousLocation = ImPlotLocation_NorthWest;
} }
void Reset() { Indices.shrink(0); Labels.Buf.shrink(0); } void Reset() { Indices.shrink(0); Labels.Buf.shrink(0); }