head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.110 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.108 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.106 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.104 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.102 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.100 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.98 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.96 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.94 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.92 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.90 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.88 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.86 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.84 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.82 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.80 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.78 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.76 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.74 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.72 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.70 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.68 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.66 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.62 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.42 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.64 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.60 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.58 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.56 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.54 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.52 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.50 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.48 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.46 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.44 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.40 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.38 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.36 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.34 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.32 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.30 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.28 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.26 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.24 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.22 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.20 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.18 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.16 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.14 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.12 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.10 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.8 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.6 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.4 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.2; locks; strict; comment @// @; 1.1 date 2012.10.03.14.40.23; author marino; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2012.10.03.14.40.23; author tron; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2012.10.05.13.22.23; author tron; state Exp; branches; next ; desc @@ 1.1 log @textproc/yamcha: Fix segfault bugs in pkemine + mktrie The textproc/cabocha package has been failing on i386 DragonFly for months. This was caused by segaults in two utilities provided by yamcha: pkemine and mktrie. Google brought up some pastebin sniplets indicating others had run into the same issue, confirming the fixes. With the revised yamcha utilities, textproc/cabocha builds nicely on DragonFly. @ text @$NetBSD$ 1) Fix segfault bug - bad char cast 2) There is a duplicate delete; "is" was previously freed already. --- libexec/mktrie.cpp.orig 2004-09-20 09:59:16.000000000 +0000 +++ libexec/mktrie.cpp @@@@ -111,13 +111,16 @@@@ int main (int argc, char **argv) column.clear(); tokenize ((const char*)buf, std::back_inserter(column)); if (column.empty()) continue; - unsigned int *tmp = new unsigned int [column.size()-1]; - for (unsigned int i = 0; i < (column.size()-1); i++) - tmp[i] = atoi (column[i+1].c_str()); + string tmp; + for (unsigned int i = 0; i < (column.size()-1); i++) { + char hexbuf[10]; // assume string(UINT32_MAX).size -> 9 + snprintf(hexbuf, sizeof(hexbuf), "%09x", atoi (column[i+1].c_str())); + tmp = tmp + hexbuf; + } feature f; - f.f = (unsigned char *)tmp; // cast + f.f = (unsigned char *)strdup(tmp.c_str()); f.id = atoi (column[0].c_str()); - f.len = 4*(column.size()-1); + f.len = tmp.size(); fv.push_back (f); } @@@@ -145,6 +148,4 @@@@ int main (int argc, char **argv) std::cerr << "FATAL: cannot save " << argv[2] << std::endl; return -1; } - - if (file != "-") delete is; } @ 1.1.2.1 log @file patch-libexec_mktrie.cpp was added on branch pkgsrc-2012Q3 on 2012-10-05 13:22:23 +0000 @ text @d1 36 @ 1.1.2.2 log @Pullup ticket #3931 - requested by marino textproc/yamcha: build fix Revisions pulled up: - textproc/yamcha/Makefile 1.4 - textproc/yamcha/distinfo 1.5 - textproc/yamcha/patches/patch-libexec_mktrie.cpp 1.1 - textproc/yamcha/patches/patch-libexec_pkemine.cpp 1.1 --- Module Name: pkgsrc Committed By: marino Date: Wed Oct 3 14:40:23 UTC 2012 Modified Files: pkgsrc/textproc/yamcha: Makefile distinfo Added Files: pkgsrc/textproc/yamcha/patches: patch-libexec_mktrie.cpp patch-libexec_pkemine.cpp Log Message: textproc/yamcha: Fix segfault bugs in pkemine + mktrie The textproc/cabocha package has been failing on i386 DragonFly for months. This was caused by segaults in two utilities provided by yamcha: pkemine and mktrie. Google brought up some pastebin sniplets indicating others had run into the same issue, confirming the fixes. With the revised yamcha utilities, textproc/cabocha builds nicely on DragonFly. @ text @a0 36 $NetBSD$ 1) Fix segfault bug - bad char cast 2) There is a duplicate delete; "is" was previously freed already. --- libexec/mktrie.cpp.orig 2004-09-20 09:59:16.000000000 +0000 +++ libexec/mktrie.cpp @@@@ -111,13 +111,16 @@@@ int main (int argc, char **argv) column.clear(); tokenize ((const char*)buf, std::back_inserter(column)); if (column.empty()) continue; - unsigned int *tmp = new unsigned int [column.size()-1]; - for (unsigned int i = 0; i < (column.size()-1); i++) - tmp[i] = atoi (column[i+1].c_str()); + string tmp; + for (unsigned int i = 0; i < (column.size()-1); i++) { + char hexbuf[10]; // assume string(UINT32_MAX).size -> 9 + snprintf(hexbuf, sizeof(hexbuf), "%09x", atoi (column[i+1].c_str())); + tmp = tmp + hexbuf; + } feature f; - f.f = (unsigned char *)tmp; // cast + f.f = (unsigned char *)strdup(tmp.c_str()); f.id = atoi (column[0].c_str()); - f.len = 4*(column.size()-1); + f.len = tmp.size(); fv.push_back (f); } @@@@ -145,6 +148,4 @@@@ int main (int argc, char **argv) std::cerr << "FATAL: cannot save " << argv[2] << std::endl; return -1; } - - if (file != "-") delete is; } @