linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2318
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Thu 2010-12-02 16:04:54 +0100
message:
  Fix unix crash
modified:
  changelog.txt
  dcpp/ShareManager.cpp
  win32/AboutDlg.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'changelog.txt'
--- changelog.txt	2010-12-01 18:49:09 +0000
+++ changelog.txt	2010-12-02 15:04:54 +0000
@@ -41,6 +41,7 @@
 * Add titles to various menus (poy)
 * [L#535556] Make sure menus are not too wide (poy)
 * [L#610466] Fix share files instantly when unfinished folder and download target is not on the same drive (emtee)
+* [L#300728] Fix infinitive recursion when sharing a directory with broken name on unix (thanks alexander sashnov)
 
 -- 0.770 2010-07-05 --
 * [L#550300] Catch more potential file corruptions (thanks bigmuscle)

=== modified file 'dcpp/ShareManager.cpp'
--- dcpp/ShareManager.cpp	2010-12-01 18:49:09 +0000
+++ dcpp/ShareManager.cpp	2010-12-02 15:04:54 +0000
@@ -631,6 +631,11 @@
 #endif
 		string name = i->getFileName();
 
+		if(name.empty()) {
+			LogManager::getInstance()->message(str(F_("Invalid file name found while hashing folder %1%") % Util::addBrackets(aName)));
+			continue;
+		}
+		
 		if(name == "." || name == "..")
 			continue;
 		if(!BOOLSETTING(SHARE_HIDDEN) && i->isHidden())

=== modified file 'win32/AboutDlg.cpp'
--- win32/AboutDlg.cpp	2010-11-24 22:14:02 +0000
+++ win32/AboutDlg.cpp	2010-12-02 15:04:54 +0000
@@ -46,7 +46,7 @@
 "steven sheehy, tobias nygren, poy, dorian, stephan hohe, mafa_45, mikael eman, james ross, "
 "stanislav maslovski, david grundberg, pavel andreev, yakov suraev, kulmegil, smir, emtee, individ, "
 "pseudonym, crise, ben, ximin luo, radox, razzloss, andrew browne, darkklor, vasily.n, netcelli, "
-"gennady proskurin, iceman50, flow84. Keep it coming!";
+"gennady proskurin, iceman50, flow84, alexander sashnov. Keep it coming!";
 
 AboutDlg::AboutDlg(dwt::Widget* parent) :
 dwt::ModalDialog(parent),