Version in base suite: 1.2+svn1430-6 Base version: vite_1.2+svn1430-6 Target version: vite_1.2+svn1430-6+deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/v/vite/vite_1.2+svn1430-6.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/v/vite/vite_1.2+svn1430-6+deb10u1.dsc changelog | 7 +++++++ patches/fieldnames | 40 ++++++++++++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 48 insertions(+) diff -Nru vite-1.2+svn1430/debian/changelog vite-1.2+svn1430/debian/changelog --- vite-1.2+svn1430/debian/changelog 2018-01-05 19:00:53.000000000 +0000 +++ vite-1.2+svn1430/debian/changelog 2020-04-08 15:32:58.000000000 +0000 @@ -1,3 +1,10 @@ +vite (1.2+svn1430-6+deb10u1) buster; urgency=medium + + * patches/fieldnames: Cherry-pick upstream fix for unbound number of field + names. + + -- Samuel Thibault Wed, 08 Apr 2020 17:32:58 +0200 + vite (1.2+svn1430-6) unstable; urgency=medium * control: Bump Standards-Version to 4.0.1 (no change). diff -Nru vite-1.2+svn1430/debian/patches/fieldnames vite-1.2+svn1430/debian/patches/fieldnames --- vite-1.2+svn1430/debian/patches/fieldnames 1970-01-01 00:00:00.000000000 +0000 +++ vite-1.2+svn1430/debian/patches/fieldnames 2020-04-08 15:32:58.000000000 +0000 @@ -0,0 +1,40 @@ +commit 3fdc4790b711bf5684c4533b6ec9e725b26f1152 +Author: Johnny Jazeix +Date: Mon Dec 3 08:49:51 2018 +0100 + + fix crash when more than 32 elements + +diff --git a/src/parser/PajeParser/PajeDefinition.hpp b/src/parser/PajeParser/PajeDefinition.hpp +index 7c6cc16..15d100c 100644 +--- a/src/parser/PajeParser/PajeDefinition.hpp ++++ b/src/parser/PajeParser/PajeDefinition.hpp +@@ -78,10 +78,10 @@ typedef enum paje_eventdef_e { + + /*! + * \brief Names of the fields describing events +- * This is a non echaustive list of the names which can be used +- * to described the fields of each events. This list conatins ++ * This is a non exhaustive list of the names which can be used ++ * to described the fields of each events. This list contains + * only the field's name required by some events. It can be +- * automatically extended inside the trace to be adfapted to ++ * automatically extended inside the trace to be adapted to + * the need of the user. + */ + #define FIELDNAME_SIZEMAX 32 +diff --git a/src/parser/PajeParser/ParserDefinitionPaje.cpp b/src/parser/PajeParser/ParserDefinitionPaje.cpp +index fca107c..500b0d8 100644 +--- a/src/parser/PajeParser/ParserDefinitionPaje.cpp ++++ b/src/parser/PajeParser/ParserDefinitionPaje.cpp +@@ -319,7 +319,10 @@ void ParserDefinitionPaje::add_field_to_definition(const PajeLine_t *line){ + #else + strcpy_s(newfn, size, fieldname); + #endif +- ++ // In case there are more than the default value ++ if(_FieldNames.size() <= _nbFieldNames) { ++ _FieldNames.resize(2*_nbFieldNames); ++ } + _FieldNames[_nbFieldNames]._name = newfn; + _FieldNames[_nbFieldNames]._id = _nbFieldNames; + _FieldNames[_nbFieldNames]._code = (1 << _nbFieldNames); diff -Nru vite-1.2+svn1430/debian/patches/series vite-1.2+svn1430/debian/patches/series --- vite-1.2+svn1430/debian/patches/series 2018-01-05 19:00:53.000000000 +0000 +++ vite-1.2+svn1430/debian/patches/series 2020-04-08 15:32:58.000000000 +0000 @@ -1 +1,2 @@ stats-crash +fieldnames