Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2306696

Browse files
committed
Fix oversight in getParamDescriptions(), and improve comments.
When getParamDescriptions was changed to handle out-of-memory betterby cribbing error recovery logic from getRowDescriptions/getAnotherTuple,somebody omitted to copy the stanza about checking for excess data inthe message. But you need to do that, since continue'ing out of theswitch in pqParseInput3 means no such check gets applied there anymore.Noted while looking at Michael Paquier's patch that made yet anothercopy of this advance_and_error logic.(This whole business desperately needs refactoring, because I sure don'twant to see a dozen copies of this code, but that's where we seem to beheaded. What's more, the "suspend parsing on EOF return" convention is aholdover from protocol 2 and shouldn't exist at all in protocol 3, becausewe don't process partial messages anymore. But for now, just fix theobvious bug.)Also, fix some wrong/missing comments about what the API spec isfor these three functions.This doesn't seem worthy of back-patching, even though it's a bug;the case shouldn't ever arise in the field.
1 parenta361c22 commit2306696

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

‎src/interfaces/libpq/fe-protocol3.c

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ handleSyncLoss(PGconn *conn, char id, int msgLength)
467467
* command for a prepared statement) containing the attribute data.
468468
* Returns: 0 if processed message successfully, EOF to suspend parsing
469469
* (the latter case is not actually used currently).
470-
* Ineither case, conn->inStart has been advanced past the message.
470+
* Inthe former case, conn->inStart has been advanced past the message.
471471
*/
472472
staticint
473473
getRowDescriptions(PGconn*conn,intmsgLength)
@@ -641,6 +641,7 @@ getRowDescriptions(PGconn *conn, int msgLength)
641641
* parseInput subroutine to read a 't' (ParameterDescription) message.
642642
* We'll build a new PGresult structure containing the parameter data.
643643
* Returns: 0 if completed message, EOF if not enough data yet.
644+
* In the former case, conn->inStart has been advanced past the message.
644645
*
645646
* Note that if we run out of data, we have to release the partially
646647
* constructed PGresult, and rebuild it again next time. Fortunately,
@@ -650,9 +651,9 @@ static int
650651
getParamDescriptions(PGconn*conn,intmsgLength)
651652
{
652653
PGresult*result;
654+
constchar*errmsg=NULL;/* means "out of memory", see below */
653655
intnparams;
654656
inti;
655-
constchar*errmsg=NULL;
656657

657658
result=PQmakeEmptyPGresult(conn,PGRES_COMMAND_OK);
658659
if (!result)
@@ -684,6 +685,13 @@ getParamDescriptions(PGconn *conn, int msgLength)
684685
result->paramDescs[i].typid=typid;
685686
}
686687

688+
/* Sanity check that we absorbed all the data */
689+
if (conn->inCursor!=conn->inStart+5+msgLength)
690+
{
691+
errmsg=libpq_gettext("extraneous data in \"t\" message");
692+
gotoadvance_and_error;
693+
}
694+
687695
/* Success! */
688696
conn->result=result;
689697

@@ -721,6 +729,11 @@ getParamDescriptions(PGconn *conn, int msgLength)
721729
printfPQExpBuffer(&conn->errorMessage,"%s\n",errmsg);
722730
pqSaveErrorResult(conn);
723731

732+
/*
733+
* Return zero to allow input parsing to continue. Essentially, we've
734+
* replaced the COMMAND_OK result with an error result, but since this
735+
* doesn't affect the protocol state, it's fine.
736+
*/
724737
return0;
725738
}
726739

@@ -729,7 +742,7 @@ getParamDescriptions(PGconn *conn, int msgLength)
729742
* We fill rowbuf with column pointers and then call the row processor.
730743
* Returns: 0 if processed message successfully, EOF to suspend parsing
731744
* (the latter case is not actually used currently).
732-
* Ineither case, conn->inStart has been advanced past the message.
745+
* Inthe former case, conn->inStart has been advanced past the message.
733746
*/
734747
staticint
735748
getAnotherTuple(PGconn*conn,intmsgLength)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp