diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-05-09 13:14:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-05-09 13:14:53 -0400 |
| commit | bae5dd6c8d4535360d471932b87431f54b515567 (patch) | |
| tree | 058112f6a8343fab1544692beb534a383234b70a /src/or/buffers.c | |
| parent | 7d3fd858388ddd4916c604ed5ab3c8cfc72dfd1c (diff) | |
| parent | 96d3219176398f377dc4a1c84e14a54e7d2516df (diff) | |
| download | tor-bae5dd6c8d4535360d471932b87431f54b515567.tar.gz tor-bae5dd6c8d4535360d471932b87431f54b515567.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Diffstat (limited to 'src/or/buffers.c')
| -rw-r--r-- | src/or/buffers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 47fa31dc07..d063d23135 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -148,7 +148,8 @@ static INLINE chunk_freelist_t * get_freelist(size_t alloc) { int i; - for (i=0; freelists[i].alloc_size <= alloc; ++i) { + for (i=0; (freelists[i].alloc_size <= alloc && + freelists[i].alloc_size); ++i ) { if (freelists[i].alloc_size == alloc) { return &freelists[i]; } |