Changeset: d112b7de4485 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d112b7de4485
Modified Files:
sql/src/backends/monet5/merovingian/daemon/peering.c
Branch: default
Log Message:
deal with fortification warnings
diffs (40 lines):
diff -r 814f39593a3c -r d112b7de4485
sql/src/backends/monet5/merovingian/daemon/peering.c
--- a/sql/src/backends/monet5/merovingian/daemon/peering.c Mon Sep 20
16:36:17 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/daemon/peering.c Mon Sep 20
17:36:28 2010 +0200
@@ -74,20 +74,32 @@
masquerade = GDKstrdup(data + 7);
snprintf(data, sizeof(data),
"tunnel %s:%hu\n", _mero_hostname, _mero_port);
- write(s, data, strlen(data));
+ if (write(s, data, strlen(data)) == -1) {
+ close(s);
+ return;
+ }
} else if (len > 0 && strcmp(data, "proxy") == 0) {
/* proxy mode */
snprintf(data, sizeof(data),
"proxy %s:%hu\n", _mero_hostname, _mero_port);
- write(s, data, strlen(data));
+ if (write(s, data, strlen(data)) == -1) {
+ close(s);
+ return;
+ }
} else if (len > 0 && strcmp(data, "direct") == 0) {
/* direct mode */
snprintf(data, sizeof(data), "direct\n");
- write(s, data, strlen(data));
+ if (write(s, data, strlen(data)) == -1) {
+ close(s);
+ return;
+ }
} else {
/* invalid, abort here */
snprintf(data, sizeof(data), "invalid request\n");
- write(s, data, strlen(data));
+ if (write(s, data, strlen(data)) == -1) {
+ /* next thing we do is closing anyway, so just keep this
+ * condition to keep fortification warnings off */
+ }
close(s);
return;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
