[Opalvoip-svn] SF.net SVN: opalvoip:[26650] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2011-11-14 02:03:34
|
Revision: 26650 http://opalvoip.svn.sourceforge.net/opalvoip/?rev=26650&view=rev Author: rjongbloed Date: 2011-11-14 02:03:28 +0000 (Mon, 14 Nov 2011) Log Message: ----------- Fixed reading a PString from a line via TCP. The peek() can give phantom EOF's if the line is segmented by TCP into multiple IP packets preventing the whole line from being read. Modified Paths: -------------- ptlib/trunk/src/ptlib/common/contain.cxx Property Changed: ---------------- ptlib/trunk/ Property changes on: ptlib/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /opal/branches/v3_6:23595 /opal/trunk:26179 /ptlib/branches/Sirius_B:24839,24844,24968,24982 /ptlib/branches/csoutheren/LalandeBranch1:23331-23333,23723 /ptlib/branches/v2_10:25177-26637 /ptlib/branches/v2_2:20746,20791,20827,22014,22942 /ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712 /ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816 /ptlib/branches/v2_8:24034,24044,24046,24054,24060,24065,24084,24090,24113,24136,24142,24165-24166,24168,24172,24367,24372,24410,24540,24992 + /opal/branches/v3_6:23595 /opal/trunk:26179 /ptlib/branches/Sirius_B:24839,24844,24968,24982 /ptlib/branches/csoutheren/LalandeBranch1:23331-23333,23723 /ptlib/branches/v2_10:25177-26648 /ptlib/branches/v2_2:20746,20791,20827,22014,22942 /ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712 /ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816 /ptlib/branches/v2_8:24034,24044,24046,24054,24060,24065,24084,24090,24113,24136,24142,24165-24166,24168,24172,24367,24372,24410,24540,24992 Modified: ptlib/trunk/src/ptlib/common/contain.cxx =================================================================== --- ptlib/trunk/src/ptlib/common/contain.cxx 2011-11-14 01:59:25 UTC (rev 26649) +++ ptlib/trunk/src/ptlib/common/contain.cxx 2011-11-14 02:03:28 UTC (rev 26650) @@ -1122,10 +1122,9 @@ SetMinSize(100); char * ptr = theArray; m_length = 0; - while (strm.peek() != EOF) { - if ((*ptr = (char)strm.get()) == '\n') - break; - ptr++; + int ch; + while ((ch = strm.get()) != EOF && ch != '\n') { + *ptr++ = (char)ch; m_length++; if (m_length >= GetSize()) { SetMinSize(m_length + 100); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |