generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction to use of TEMP_FAILURE_RETRY in send_prop_msg

Browse Source 
RETRY macro may retry command if result is -1. In this
case the command was "connect < 0" instead of just
connect. The comparison will not return -1 and thus
retry is never done. This is now corrected so that
interrupts will cause retry instead of fail.

(There was no other negative side effect of the bug.
The result code from RETRY was used in an if-statement
and it would be true for all negative connect results.
This was according to expectations.)

Change-Id: Ie206b39878e9befea4e3be9a4061ee39eb232d80
This commit is contained in:
Jens Gulin
2012-07-19 14:10:46 +02:00
committed by Johan Redestig
parent f6ee33cee7
commit c20d0f3993
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/system_properties.c
View File

@@ -176,7 +176,7 @@ static int send_prop_msg(prop_msg *msg)
addr.sun_family = AF_LOCAL;
alen = namelen + offsetof(struct sockaddr_un, sun_path) + 1;
if(TEMP_FAILURE_RETRY(connect(s, (struct sockaddr *) &addr, alen) < 0)) {
if(TEMP_FAILURE_RETRY(connect(s, (struct sockaddr *) &addr, alen)) < 0) {
close(s);
return result;
}