summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-08-02 15:16:24 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2013-10-28 15:47:13 +0900
commitf5fee255de5a2e9f33c2d2f5b87b9ba02fd65922 (patch)
treef69f32f67a7c43fcbfb7c75fe6864034020964e7 /src/bin
parenta230e41409b21c05fab6a47ea2a5510ac848d9d1 (diff)
evas/cserve2: Fix race condition on font load / socket fail
If the client exits while the server is loading fonts, the font entry objects are accessed after being freed. Note: This is not a proper fix. The race condition should still be fixed, but delaying client deletion a bit might help for a while...
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/evas/evas_cserve2_messages.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/bin/evas/evas_cserve2_messages.c b/src/bin/evas/evas_cserve2_messages.c
index e5cb1b7ee8..168bd72d6c 100644
--- a/src/bin/evas/evas_cserve2_messages.c
+++ b/src/bin/evas/evas_cserve2_messages.c
@@ -172,9 +172,6 @@ cserve2_client_send(Client *client, const void *data, size_t size)
172 // so we must close the connection to the client and remove 172 // so we must close the connection to the client and remove
173 // its references inside our cache. 173 // its references inside our cache.
174 WRN("Error on socket with client %d: %s", client->id, strerror(errno)); 174 WRN("Error on socket with client %d: %s", client->id, strerror(errno));
175 if (client->msg.reading)
176 _client_msg_free(client);
177 cserve2_client_del(client);
178 return sent; 175 return sent;
179 } 176 }
180 if (sent < 0) 177 if (sent < 0)