diff options
author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-11-21 02:01:59 +0000 |
---|---|---|
committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-11-21 02:01:59 +0000 |
commit | f2e8579ba375ef960209214fe432afd3bb3f83b1 (patch) | |
tree | 4edfc0681cce40fe421fee59081a80b8621d698d /merge.c | |
parent | 3c8e31e0557a75c4992c2685a6c0be090c1ac4dd (diff) |
Fix potential infinite loop introduced with r39961 and find by the buildbot. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6599
svn path=/trunk/; revision=39963
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions