From 2c96f135c2fd36955330a6d6c6003910e80f28ec Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 28 Feb 2008 11:19:54 +0000 Subject: [PATCH] Undo bug #1047 heap overrun fix as it is not correct. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6508 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/ReleaseNotes | 2 +- bacula/src/filed/backup.c | 10 +++++----- bacula/technotes-2.1 | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index 80a9a95690..dc8afc8c6d 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -1,7 +1,7 @@ Release Notes for Bacula 2.2.8 - Bacula code: Total files = 520 Total lines = 195,550 (*.h *.c *.in) + Bacula code: Total files = 498 Total lines = 167,596 (*.h *.c *.in) 82 new files, 41,221 new lines of code, 208,380 lines of change from 2.0.3 This Director and Storage daemon must be upgraded at the same time, diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c index d61c89bb02..795e6d92a4 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -1155,12 +1155,12 @@ static void strip_path(FF_PKT *ff_pkt) if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) { pm_strcpy(ff_pkt->link_save, ff_pkt->link); if (!do_strip(ff_pkt->strip_path, ff_pkt->link)) { - pm_strcpy(ff_pkt->link, ff_pkt->link_save); - pm_strcpy(ff_pkt->fname, ff_pkt->fname_save); + strcpy(ff_pkt->link, ff_pkt->link_save); + strcpy(ff_pkt->fname, ff_pkt->fname_save); } } } else { - pm_strcpy(ff_pkt->fname, ff_pkt->fname_save); + strcpy(ff_pkt->fname, ff_pkt->fname_save); } Dmsg2(200, "fname=%s stripped=%s\n", ff_pkt->fname_save, ff_pkt->fname); } @@ -1170,8 +1170,8 @@ static void unstrip_path(FF_PKT *ff_pkt) if (!(ff_pkt->flags & FO_STRIPPATH) || ff_pkt->strip_path <= 0) { return; } - pm_strcpy(ff_pkt->fname, ff_pkt->fname_save); + strcpy(ff_pkt->fname, ff_pkt->fname_save); if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) { - pm_strcpy(ff_pkt->link, ff_pkt->link_save); + strcpy(ff_pkt->link, ff_pkt->link_save); } } diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index 13b794b104..735cba879a 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -1,6 +1,8 @@ Technical notes on version 2.2 General: +27Feb08 +kes Undo bug #1047 heap overrun fix as it is not correct. 14Feb08 kes Fix creating first JobMedia record during Migration to include proper index. This caused slow restores of migrated jobs. -- 2.39.5