[patch] Patch

bug.patch (text/plain), 1.58 KB, created by Christophe PEREZ on 2021-04-24 20:25:42 UTC

diff -ur incron-1eedfbc9b318372efd119fd17f4abdbde561a53d.old/usertable.cpp incron-1eedfbc9b318372efd119fd17f4abdbde561a53d/usertable.cpp
--- incron-1eedfbc9b318372efd119fd17f4abdbde561a53d.old/usertable.cpp	2017-11-14 03:20:38.000000000 +0100
+++ incron-1eedfbc9b318372efd119fd17f4abdbde561a53d/usertable.cpp	2021-04-24 22:09:08.927534227 +0200
@@ -370,20 +370,21 @@
 {
   InotifyWatch* pW = rEvt.GetWatch();
   IncronTabEntry* pE = FindEntry(pW);
+  std::string pW_path = pW->GetPath();
 
   // no entry found - this shouldn't occur
   if (pE == NULL)
     return;
 
   // discard event if user has no access rights to watch path
-  if (!(m_fSysTable || MayAccess(pW->GetPath(), DONT_FOLLOW(rEvt.GetMask()))))
+  if (!(m_fSysTable || MayAccess(pW_path, DONT_FOLLOW(rEvt.GetMask()))))
     return;
     
   //#if 0
   // log output for each dir + file + event
   std::string events;
   rEvt.DumpTypes(events);
-  syslog(LOG_INFO, "PATH (%s) FILE (%s) EVENT (%s)", pW->GetPath().c_str() , IncronTabEntry::GetSafePath(rEvt.GetName()).c_str() , events.c_str());
+  syslog(LOG_INFO, "PATH (%s) FILE (%s) EVENT (%s)", pW_path.c_str() , IncronTabEntry::GetSafePath(rEvt.GetName()).c_str() , events.c_str());
   //#endif
   
   // add new watch for newly created subdirs
@@ -422,7 +423,7 @@
       else {
         cmd.append(cs.substr(oldpos, pos-oldpos));
         if (cs[px] == '@') {          // base path
-          cmd.append(IncronTabEntry::GetSafePath(pW->GetPath()));
+          cmd.append(IncronTabEntry::GetSafePath(pW_path));
           oldpos = pos + 2;
         }
         else if (cs[px] == '#') {     // file name