[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9405 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9405 - gnunet/src/util |
Date: |
Thu, 5 Nov 2009 06:50:25 -0700 |
Author: grothoff
Date: 2009-11-05 06:50:25 -0700 (Thu, 05 Nov 2009)
New Revision: 9405
Modified:
gnunet/src/util/bio.c
gnunet/src/util/test_bio.c
Log:
fixes
Modified: gnunet/src/util/bio.c
===================================================================
--- gnunet/src/util/bio.c 2009-11-05 08:29:25 UTC (rev 9404)
+++ gnunet/src/util/bio.c 2009-11-05 13:50:25 UTC (rev 9405)
@@ -58,6 +58,8 @@
fd = GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_READ,
GNUNET_DISK_PERM_NONE);
+ if (NULL == fd)
+ return NULL;
h = GNUNET_malloc (sizeof (struct GNUNET_BIO_ReadHandle) + BIO_BUFFER_SIZE);
h->buffer = (char *) &h[1];
h->size = BIO_BUFFER_SIZE;
@@ -176,15 +178,16 @@
return GNUNET_SYSERR;
}
buf = GNUNET_malloc (big);
+ *result = buf;
buf[--big] = '\0';
if (big == 0)
return GNUNET_OK;
if (GNUNET_OK != GNUNET_BIO_read (h, what, buf, big))
{
GNUNET_free (buf);
+ *result = NULL;
return GNUNET_SYSERR;
}
- *result = buf;
return GNUNET_OK;
}
@@ -308,6 +311,8 @@
GNUNET_DISK_OPEN_CREATE,
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE);
+ if (NULL == fd)
+ return NULL;
h =
GNUNET_malloc (sizeof (struct GNUNET_BIO_WriteHandle) + BIO_BUFFER_SIZE);
h->buffer = (char *) &h[1];
@@ -390,6 +395,7 @@
h->have = 0;
}
while (pos < n); /* should always be true */
+ GNUNET_break (0);
return GNUNET_OK;
}
Modified: gnunet/src/util/test_bio.c
===================================================================
--- gnunet/src/util/test_bio.c 2009-11-05 08:29:25 UTC (rev 9404)
+++ gnunet/src/util/test_bio.c 2009-11-05 13:50:25 UTC (rev 9405)
@@ -123,9 +123,11 @@
GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_int64 (fileR, &testNum));
fileR2 = GNUNET_BIO_read_open (fileName2);
GNUNET_assert (NULL != fileR2);
+ readResultString = (char*) "not null";
GNUNET_assert (GNUNET_SYSERR ==
GNUNET_BIO_read_string (fileR2, "Read string error",
&readResultString, 200));
+ GNUNET_assert (NULL == readResultString);
fileR3 = GNUNET_BIO_read_open (fileName3);
GNUNET_assert (NULL != fileR3);
GNUNET_assert (GNUNET_SYSERR ==
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9405 - gnunet/src/util,
gnunet <=