From: Nirbhay Choubey
Date: April 27 2011 11:54am
Subject: bzr commit into mysql-5.1 branch (nirbhay.choubey:3674) Bug#12329909
List-Archive: http://lists.mysql.com/commits/136195
X-Bug: 12329909
Message-Id: <201104271154.p3RBsaQG025625@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1973681915=="

--===============1973681915==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/nirbhay/Project/mysql/repo/bugs/mysql-5.1.12329909/ based on revid:sergey.glukhov@stripped

 3674 Nirbhay Choubey	2011-04-27
      BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORT
                     FAILS WITH LIBEDIT
      
      Fixed by checking the return value of the write()
      function calls and handling the open files and fd
      appropriately.
     @ cmd-line-utils/libedit/vi.c
        BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORT
                       FAILS WITH LIBEDIT
        
        Added a check on the return value of the write()
        function calls.

    modified:
      cmd-line-utils/libedit/vi.c
=== modified file 'cmd-line-utils/libedit/vi.c'
--- a/cmd-line-utils/libedit/vi.c	2010-10-19 22:36:59 +0000
+++ b/cmd-line-utils/libedit/vi.c	2011-04-27 11:54:10 +0000
@@ -1012,8 +1012,10 @@ vi_histedit(EditLine *el, int c __attrib
 	if (fd < 0)
 		return CC_ERROR;
 	cp = el->el_line.buffer;
-	write(fd, cp, el->el_line.lastchar - cp +0u);
-	write(fd, "\n", 1);
+	if (write(fd, cp, el->el_line.lastchar - cp +0u) == -1)
+          goto error;
+	if (write(fd, "\n", 1) == -1)
+          goto error;
 	pid = fork();
 	switch (pid) {
 	case -1:
@@ -1041,6 +1043,12 @@ vi_histedit(EditLine *el, int c __attrib
 	unlink(tempfile);
 	/* return CC_REFRESH; */
 	return ed_newline(el, 0);
+
+/* XXXMYSQL: Avoid compiler warnings. */
+error:
+        close(fd);
+        unlink(tempfile);
+        return CC_ERROR;
 }
 
 /* vi_history_word():


--===============1973681915==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/nirbhay.choubey@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: nirbhay.choubey@stripped\
#   vpeshiv6u5snkvzi
# target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.1.12329909/
# testament_sha1: 0f35c4ff8dbde2453dc4da9bce30856ee708b397
# timestamp: 2011-04-27 17:24:16 +0530
# base_revision_id: sergey.glukhov@stripped\
#   b7028gag212n8e0y
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRJBihwAAe/fgEU4WH///3/n
/uS////wUATBzuBO9Le6bdnd3XMJRCAp5JPZFPNT0aMiZRk2p6mNTQ2QT01DTQ2iDKRkT0myCemS
JoNDQGjQAAAAAAkkBNTJlTepP1TxJ5T0n6UYgeUaNDI0AAAA2pTRPVT81SeyHqp7E9Sj09U8U/VD
agAGQAAD1AJKKelNptU9NCejInqaeiAAAaAaDQAyBsgQfMN6joMFbwv537THisgLxGS4MQzG9jb3
KgP1vvkD08s9jrl1EQYiVw95L48Z5e4s23VVU/dJ/XSSsJlwOYyaAc30vGHlJHag1B1HYaK/8LCf
iJsc5nG++DygcUPDlpawUPEgxijzxRyYfVtMMOIblYJfI0G2lMJV0G9r8/LATRbe4Wc4oXFcxi/R
NDsz/vMa6LS5GE7cIzrUigHgmG28I02ZMj7OZ4QSTcndK2nYS4Ewolg5wKNqoUMsFtUlYOcVN55L
KWMsvIO3WaqxV7ZJ1iBxpNNhZIQKwUFKuQMThyVwLVJPQICTFdqBmtXUaBE2M1ylAbj2Jhcc245F
baZEFllpB2S5Ze0W4HLIGTToN42jCaXtAzofkIx9hRSXULE5VnJsOAoESlikB89DroC7AYlgiOeR
LaYgGXIsdYnqVJfnYFg59rzHcKTCNDsNjBLrguL5V0zB15JpCRQ+C6lGb9lqv32FQKn3jOYgQ0xT
DFSFMy0RFYFejDKVSGBbXOQhF4ILDBUYeps74SMQpGVjkVirI9a1QJV2tW+CarCdbNHVcVma/llT
IZB1dHvg5+/a0ZQHkCT1F0Xpzx0wjNqH25jsl/Kd7Xbmzp8jNp05osiaETwLUUbFFVdxuMo8MXwV
MI03EOQ37Tg/R9B3BENPYiDKGVWSQYMMzS1TmCIyLM620rn2nkY+KF0SEcEgvmmOiiypiH3512OI
tLQzc3Nq+be34ohL1dqWhwevZ9jQXJ35ybkXr4UNkl7nLTzJL0QFTDWa+lI8XVfIzGBKBMoce/NM
iYJCnGYX0wmku0nsPu2r8I5LNkiw5I/F/VkkOmqG9UUeOes+nDhzkSowKii11G12Quy9JeRy2EYY
JlZVVR7bHvruV4r1FlOoMCZuWSa+MjZkrkTPO/SSskIw4Y1GXck7Cl8hy1VNgpnXP3X66oaGh+Jm
iurisRi2OrJsS0ZVS/LMiRUWMl8Cot1DBIfSsFKQ2DLTdfu2XSwt+h3MXlihx1Ua2pUkymTk5YnG
mFl1LuL9EuPW2IWO1gaIotgbVMW56WxXdsvBjMIsfAuSYzC28vfoVFih8ywxCYFcF+YJUtxsbKxt
dV2rWJw8KyVwJCULd5bQslaw5etA9ka4leCoOE6ChFAo7WmP22OHEq0hkWfLgdgXY6GL6XGQaBuV
uxI0KZG4qO/wTjEqfnfOkCLOP642pjGFLhioGYiyI0dRcE3JhkkiqbKJmGN3WTXQrWGkQ9OZLGhz
C9EQiCJM7EpuUmVEJCmYJLiqDSyEtiNJLlD0DoNK2X1SZOZQqFEIIZwI4Uc9gr4Gjwk1MAZ6tKIn
gkddVBMG0GhieBCNqN9skBXg6a2bhY4tVzUW89F5NfhY2WpiLJADYN2Sclc1DJbjyMpONW84rhIE
LCvMf40m3zQRUkoZlSMbzlyxNGutxspRA0q80FMqjXBLzuRvRnqrJFZdOtafnIFOeZKvdJWuCccw
XrtU4YKVDiE//i7kinChICSDFDg=


--===============1973681915==--