Fix bug in do_query.

Upon receiving DataRow packet, it converts the number of fields from
network byte order to host byte order.  Unfortunately it used htons()
for this purpose instead of ntohs(). This is simply wrong. Similarly it
used htonl() instead of htohl() while converting the data length from
network byte order to host byte order. This is wrong too. But
fortunately both ntohs()/htons() and ntohl()/htonl() swap the byte and
they bring the same result (i.e. htonl(data_len) ==
ntohl(data_len). So actually the bug does not hurt anything.
However a bug is a bug. This commit fixes them.

Backpatch-through: v4.1

diff --git a/src/protocol/pool_process_query.c b/src/protocol/pool_process_query.c
index d40f21fad6a9797a53b0d5bbf429552f53771d62..5003b553b103c604bfa3bd25324c8caa6f684ff4 100644 (file)
--- a/src/protocol/pool_process_query.c
+++ b/src/protocol/pool_process_query.c
@@ -2372,7 +2372,7 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
                                        if (p)
                                        {
                                                memcpy(&shortval, p, sizeof(short));
-                                               num_fields = htons(shortval);
+                                               num_fields = ntohs(shortval);
                                                p += sizeof(short);
                                        }
                                        else
@@ -2404,7 +2404,7 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
                                                if (major == PROTO_MAJOR_V3)
                                                {
                                                        memcpy(&intval, p, sizeof(int));
-                                                       len = htonl(intval);
+                                                       len = ntohl(intval);
                                                        p += sizeof(int);
 
                                                        res->nullflags[num_data] = len;