[SiRoB]

Hi,
we fill hashlist with those hashset,
hashsetneeded is set to true in CreatePartFile(),
we request to a user the hashset,
we considere his answer corrupted due to malformed hashlist,
we purge hashset,
then next hashset request will success.

[SlugFiller]

I can't understand what you're trying to say...

[SiRoB]

Ok i will reduce your brain power consumption...

Quote

// SLUGFILLER: SafeHash - setting at the hotspot
if (hashlist.GetCount() == 0) { //MORPH - Changed by SiRoB, Fix ed2klink with hashset
  if (GetED2KPartCount() > 1) {
  hashsetneeded = true;
  } else {
  hashsetneeded = false;
  uchar* cur_hash = new uchar[16];
  md4cpy(cur_hash, m_abyFileHash);
  hashlist.Add(cur_hash);
  }
}

[EDIT]

SlugFiller, on Mar 14 2006, 01:03 AM, said:

I still had to use some brain power on that one. The proper post should have been:

Quote

In CreatePartFile, the hashset is assumed to be empty when checking whether it is needed or not, even though it can be set prior to the function call if an ed2k link contains a hashset.

That would have taken away far less thinking time.

Your fix is close, by the way, but not quite right. What you should have done, under the assumption that the file is not really initialized but is half-loaded, is to just use the code from LoadPartFile:

  // SLUGFILLER: SafeHash - ignore loaded hash for 1-chunk files
  if (GetED2KPartCount() <= 1) {
  	for (int i = 0; i < hashlist.GetSize(); i++)
    delete[] hashlist[i];
  	hashlist.RemoveAll();
  	uchar* cur_hash = new uchar[16];
  	md4cpy(cur_hash, m_abyFileHash);
  	hashlist.Add(cur_hash);
  }

But wait, this code doesn't set hashsetneeded. That part is several lines below, so let's just add it(with a trimmed down "else"):

	if (GetHashCount() != GetED2KPartCount()) {
  ASSERT( hashlist.GetSize() == 0 );
  hashsetneeded = true;
	}
	else
  hashsetneeded = false;

While we're at it, we can also empty the hashlist in place of that ASSERT, but LoadHashsetFromFile would already do that prior to the ASSERT anyway.

Ok seem a war start.
As i was censored by someone below this quoted post, i posting there.

My fix is alright even if it irritate some guy arround.

SlugFiller is trying to fix a trouble that can't occur.

P.S.: As i said in my censored post , it's my last support to someone that stay as close on their numerous mistake and always thank's people with great talent.
[/EDIT]

This post has been edited by SiRoB: 14 March 2006 - 05:27 PM

[SlugFiller]

I still had to use some brain power on that one. The proper post should have been:

Quote

In CreatePartFile, the hashset is assumed to be empty when checking whether it is needed or not, even though it can be set prior to the function call if an ed2k link contains a hashset.

That would have taken away far less thinking time.

Your fix is close, by the way, but not quite right. What you should have done, under the assumption that the file is not really initialized but is half-loaded, is to just use the code from LoadPartFile:

  // SLUGFILLER: SafeHash - ignore loaded hash for 1-chunk files
  if (GetED2KPartCount() <= 1) {
  	for (int i = 0; i < hashlist.GetSize(); i++)
    delete[] hashlist[i];
  	hashlist.RemoveAll();
  	uchar* cur_hash = new uchar[16];
  	md4cpy(cur_hash, m_abyFileHash);
  	hashlist.Add(cur_hash);
  }

But wait, this code doesn't set hashsetneeded. That part is several lines below, so let's just add it(with a trimmed down "else"):

	if (GetHashCount() != GetED2KPartCount()) {
  ASSERT( hashlist.GetSize() == 0 );
  hashsetneeded = true;
	}
	else
  hashsetneeded = false;

While we're at it, we can also empty the hashlist in place of that ASSERT, but LoadHashsetFromFile would already do that prior to the ASSERT anyway.

[SiRoB]

Nice to see that you aren't still changing in your answer.

Thank's for you great talent to turn arround your mistake like a snake and try to smoke other to feel better.

[Stulle]

SiRoB, on Mar 14 2006, 05:35 PM, said:

Nice to see that you aren't still changing in your answer. 

Thank's for you great talent to turn arround your mistake like a snake and try to smoke other to feel better. 

I love you! Not in a gay way but in a platonic way!

[SlugFiller]

To properly iterate:
1. SiRoB's fix fails to ignore and throw away 1-chunk hashsets. Sure, they should not be there in the first place, but assuming input is valid is always asking for it in wild-use software. Sure, there aren't many scenarios where this would be a problem, but that's no excuse to be careless.
2. I am forced to close this thread because someone obviously wants to turn this into a flamewar, so I'll stop this before it is filled with more profanity. I will not tolerate pointless use of expletives here, and since I don't have editing rights, infriging posts shall be deleted with extreme prejudice.
3. If SiRoB doesn't like my code, he can feel free to stop using it in his mod. I certainly don't intend to use any of his.