Commit 5cbc8875 authored Mar 18, 2008 by Nick Mathewson

r18931@catbus: nickm | 2008-03-18 12:08:44 -0400

 Backport to 0.1.2: Detect errors from directory listing correctly on win32.  Bug found by lodger.


svn:r14104

parent 69198d01

ChangeLog

+3 −2

Original line number	Diff line number	Diff line
		Changes in versino 0.1.2.20 - 2008-??-??
		Changes in version 0.1.2.20 - 2008-??-??
		o Major bugfixes:
		- Patch from "Andrew S. Lists" to catch when we contact a directory
		mirror at IP address X and he says we look like we're coming from
		@@ -21,7 +21,8 @@ Changes in versino 0.1.2.20 - 2008-??-??
		cached-descriptors file. Patch by freddy77.
		- Detect size overflow in zlib code.
		- Fix a pointer error that kept us from reporting nameserver errors.

		- On Windows, correctly detect errors when listing the contents of a
		directory. Fix from lodger.

		Changes in version 0.1.2.19 - 2008-01-17
		Tor 0.1.2.19 fixes a huge memory leak on exit relays, makes the default

src/common/util.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1607,7 +1607,7 @@ tor_listdir(const char *dirname)
		size_t pattern_len = strlen(dirname)+16;
		pattern = tor_malloc(pattern_len);
		tor_snprintf(pattern, pattern_len, "%s\\*", dirname);
		if (!(handle = FindFirstFile(pattern, &findData))) {
		if (INVALID_HANDLE_VALUE == (handle = FindFirstFile(pattern, &findData))) {
		tor_free(pattern);
		return NULL;
		}

src/or/control.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3192,7 +3192,7 @@ control_event_status(int type, int severity, const char *format, va_list args)
		status = "STATUS_CLIENT";
		break;
		case EVENT_STATUS_SERVER:
		status = "STATUS_SEVER";
		status = "STATUS_SERVER";
		break;
		default:
		log_warn(LD_BUG, "Unrecognized status type %d", type);