From 188d134d70b4b511b1e94c003e3957c8e080cdc3 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 11 Feb 2019 07:25:26 -0500 Subject: [PATCH] 2019-02-11 Fred Gleason Fixed a bug in rdcatchd(8) that could cause invalid filenames to be generated for temporary files. --- ChangeLog | 3 +++ rdcatchd/rdcatchd.cpp | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53acf8eb..5e93df5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18467,3 +18467,6 @@ 2019-02-07 Fred Gleason Fixed a regression in rdlibrary(1) that made it impossible to enter apostrophes or quotes in RMLs. +2019-02-11 Fred Gleason + Fixed a bug in rdcatchd(8) that could cause invalid filenames + to be generated for temporary files. diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index 15d06beb..77e170af 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -2550,9 +2550,8 @@ QString MainObject::BuildTempName(int event,QString str) QString MainObject::BuildTempName(CatchEvent *evt,QString str) { - return QString().sprintf("%s/rdcatchd-%s-%d.%s",(const char *)catch_temp_dir, - (const char *)str,evt->id(), - (const char *)GetFileExtension(evt->resolvedUrl())); + return catch_temp_dir+"/rdcatchd="+str+ + QString().sprintf("%u-%u",evt->id(),getpid()); }