Merge remote-tracking branch 'origin/topic/vern/cat-builtin-tmp'

* origin/topic/vern/cat-builtin-tmp:
  fixed access to uninitialized memory in ZAM's "cat" built-in
This commit is contained in:
Arne Welzel 2024-11-08 15:22:48 +01:00
commit 8613f821f9
4 changed files with 8 additions and 3 deletions

View file

@ -1,3 +1,9 @@
7.1.0-dev.471 | 2024-11-08 15:22:48 +0100
* fixed access to uninitialized memory in ZAM's "cat" built-in (Vern Paxson, Corelight)
* GH-3906: ci: Add asan and ubsan sanitizer tasks for ZAM (Arne Welzel, Corelight)
7.1.0-dev.467 | 2024-11-06 11:50:12 +0100
* Make Spicy hook execution order deterministic in test (Benjamin Bannier, Corelight)

View file

@ -1 +1 @@
7.1.0-dev.467
7.1.0-dev.471

View file

@ -72,7 +72,7 @@ void FixedCatArg::RenderInto(const ZVal& z, char*& res) {
n = modp_dtoa2(d, res, 6);
res += n;
if ( util::approx_equal(d, nearbyint(d), 1e-9) && std::isfinite(d) && ! strchr(tmp, 'e') ) {
if ( util::approx_equal(d, nearbyint(d), 1e-9) && std::isfinite(d) ) {
// disambiguate from integer
*(res++) = '.';
*(res++) = '0';

View file

@ -42,7 +42,6 @@ public:
protected:
TypePtr t;
char tmp[256];
};
class StringCatArg : public CatArg {