diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-11-09 21:24:44 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-11-09 21:24:44 +0000 |
commit | c193ad71b2ba954bc414c568566ef0d02ba73f98 (patch) | |
tree | 5739212d59749dda2435e9e26018211003d38a06 /src/util/test_bio.c | |
parent | e7f2d2c83f53fac71e827dbaa73e84832d1bf7c0 (diff) | |
download | gnunet-c193ad71b2ba954bc414c568566ef0d02ba73f98.tar.gz gnunet-c193ad71b2ba954bc414c568566ef0d02ba73f98.zip |
fixing more bugs in test_bio, largely leaks
Diffstat (limited to 'src/util/test_bio.c')
-rw-r--r-- | src/util/test_bio.c | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/src/util/test_bio.c b/src/util/test_bio.c index 9ff9a5176..cf4433018 100644 --- a/src/util/test_bio.c +++ b/src/util/test_bio.c | |||
@@ -42,7 +42,7 @@ test_normal_rw () | |||
42 | struct GNUNET_CONTAINER_MetaData *metaDataW; | 42 | struct GNUNET_CONTAINER_MetaData *metaDataW; |
43 | struct GNUNET_CONTAINER_MetaData *metaDataR; | 43 | struct GNUNET_CONTAINER_MetaData *metaDataR; |
44 | metaDataW = GNUNET_CONTAINER_meta_data_create (); | 44 | metaDataW = GNUNET_CONTAINER_meta_data_create (); |
45 | metaDataR = GNUNET_CONTAINER_meta_data_create (); | 45 | metaDataR = NULL; |
46 | GNUNET_CONTAINER_meta_data_add_publication_date (metaDataW); | 46 | GNUNET_CONTAINER_meta_data_add_publication_date (metaDataW); |
47 | 47 | ||
48 | fileW = GNUNET_BIO_write_open (fileName); | 48 | fileW = GNUNET_BIO_write_open (fileName); |
@@ -55,9 +55,12 @@ test_normal_rw () | |||
55 | 55 | ||
56 | fileR = GNUNET_BIO_read_open (fileName); | 56 | fileR = GNUNET_BIO_read_open (fileName); |
57 | GNUNET_assert (NULL != fileR); | 57 | GNUNET_assert (NULL != fileR); |
58 | readResultString = NULL; | ||
58 | GNUNET_assert (GNUNET_OK == | 59 | GNUNET_assert (GNUNET_OK == |
59 | GNUNET_BIO_read_string (fileR, "Read string error", | 60 | GNUNET_BIO_read_string (fileR, "Read string error", |
60 | &readResultString, 200)); | 61 | &readResultString, 200)); |
62 | GNUNET_assert (0 == strcmp (TESTSTRING, readResultString)); | ||
63 | GNUNET_free (readResultString); | ||
61 | GNUNET_assert (GNUNET_OK == | 64 | GNUNET_assert (GNUNET_OK == |
62 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", | 65 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", |
63 | &metaDataR)); | 66 | &metaDataR)); |
@@ -116,9 +119,11 @@ test_emptystring_rw () | |||
116 | 119 | ||
117 | fileR = GNUNET_BIO_read_open (fileName); | 120 | fileR = GNUNET_BIO_read_open (fileName); |
118 | GNUNET_assert (NULL != fileR); | 121 | GNUNET_assert (NULL != fileR); |
122 | readResultString = NULL; | ||
119 | GNUNET_assert (GNUNET_OK == | 123 | GNUNET_assert (GNUNET_OK == |
120 | GNUNET_BIO_read_string (fileR, "Read string error", | 124 | GNUNET_BIO_read_string (fileR, "Read string error", |
121 | &readResultString, 200)); | 125 | &readResultString, 200)); |
126 | GNUNET_free (readResultString); | ||
122 | GNUNET_BIO_read_close (fileR, &msg); | 127 | GNUNET_BIO_read_close (fileR, &msg); |
123 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); | 128 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); |
124 | GNUNET_free (fileName); | 129 | GNUNET_free (fileName); |
@@ -141,10 +146,14 @@ test_bigstring_rw () | |||
141 | 146 | ||
142 | fileR = GNUNET_BIO_read_open (fileName); | 147 | fileR = GNUNET_BIO_read_open (fileName); |
143 | GNUNET_assert (NULL != fileR); | 148 | GNUNET_assert (NULL != fileR); |
149 | readResultString = NULL; | ||
144 | GNUNET_assert (GNUNET_SYSERR == | 150 | GNUNET_assert (GNUNET_SYSERR == |
145 | GNUNET_BIO_read_string (fileR, "Read string error", | 151 | GNUNET_BIO_read_string (fileR, "Read string error", |
146 | &readResultString, 1)); | 152 | &readResultString, 1)); |
153 | GNUNET_assert (NULL == readResultString); | ||
154 | msg = NULL; | ||
147 | GNUNET_BIO_read_close (fileR, &msg); | 155 | GNUNET_BIO_read_close (fileR, &msg); |
156 | GNUNET_free (msg); | ||
148 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); | 157 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); |
149 | GNUNET_free (fileName); | 158 | GNUNET_free (fileName); |
150 | return 0; | 159 | return 0; |
@@ -163,7 +172,6 @@ test_bigmeta_rw () | |||
163 | struct GNUNET_CONTAINER_MetaData *metaDataW; | 172 | struct GNUNET_CONTAINER_MetaData *metaDataW; |
164 | struct GNUNET_CONTAINER_MetaData *metaDataR; | 173 | struct GNUNET_CONTAINER_MetaData *metaDataR; |
165 | metaDataW = GNUNET_CONTAINER_meta_data_create (); | 174 | metaDataW = GNUNET_CONTAINER_meta_data_create (); |
166 | metaDataR = GNUNET_CONTAINER_meta_data_create (); | ||
167 | GNUNET_CONTAINER_meta_data_add_publication_date (metaDataW); | 175 | GNUNET_CONTAINER_meta_data_add_publication_date (metaDataW); |
168 | GNUNET_assert (GNUNET_OK == | 176 | GNUNET_assert (GNUNET_OK == |
169 | GNUNET_CONTAINER_meta_data_insert (metaDataW, | 177 | GNUNET_CONTAINER_meta_data_insert (metaDataW, |
@@ -176,13 +184,15 @@ test_bigmeta_rw () | |||
176 | 184 | ||
177 | fileR = GNUNET_BIO_read_open (fileName); | 185 | fileR = GNUNET_BIO_read_open (fileName); |
178 | GNUNET_assert (NULL != fileR); | 186 | GNUNET_assert (NULL != fileR); |
187 | metaDataR = NULL; | ||
179 | GNUNET_assert (GNUNET_SYSERR == | 188 | GNUNET_assert (GNUNET_SYSERR == |
180 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", | 189 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", |
181 | &metaDataR)); | 190 | &metaDataR)); |
191 | msg = NULL; | ||
182 | GNUNET_BIO_read_close (fileR, &msg); | 192 | GNUNET_BIO_read_close (fileR, &msg); |
183 | 193 | GNUNET_free (msg); | |
184 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); | 194 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); |
185 | GNUNET_CONTAINER_meta_data_destroy (metaDataR); | 195 | GNUNET_assert (NULL == metaDataR); |
186 | GNUNET_CONTAINER_meta_data_destroy (metaDataW); | 196 | GNUNET_CONTAINER_meta_data_destroy (metaDataW); |
187 | GNUNET_free (fileName); | 197 | GNUNET_free (fileName); |
188 | return 0; | 198 | return 0; |
@@ -197,7 +207,9 @@ test_directory_r(){ | |||
197 | fileR = GNUNET_BIO_read_open ("/dev"); | 207 | fileR = GNUNET_BIO_read_open ("/dev"); |
198 | GNUNET_assert (NULL != fileR); | 208 | GNUNET_assert (NULL != fileR); |
199 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read (fileR, "Read error", readResult, 65537)); | 209 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read (fileR, "Read error", readResult, 65537)); |
210 | msg = NULL; | ||
200 | GNUNET_BIO_read_close (fileR, &msg); | 211 | GNUNET_BIO_read_close (fileR, &msg); |
212 | GNUNET_free (msg); | ||
201 | return 0; | 213 | return 0; |
202 | } | 214 | } |
203 | 215 | ||
@@ -235,7 +247,7 @@ test_nullfile_rw () | |||
235 | GNUNET_BIO_write_meta_data (fileW, metaDataW)); | 247 | GNUNET_BIO_write_meta_data (fileW, metaDataW)); |
236 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_write_close (fileW)); | 248 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_write_close (fileW)); |
237 | 249 | ||
238 | fileW = GNUNET_BIO_write_open (fileName); | 250 | fileW = GNUNET_BIO_write_open ("/dev/full"); |
239 | GNUNET_assert (NULL != fileW); | 251 | GNUNET_assert (NULL != fileW); |
240 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_write_close (fileW)); | 252 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_write_close (fileW)); |
241 | 253 | ||
@@ -243,14 +255,18 @@ test_nullfile_rw () | |||
243 | GNUNET_assert (NULL != fileR); | 255 | GNUNET_assert (NULL != fileR); |
244 | GNUNET_assert (GNUNET_SYSERR == | 256 | GNUNET_assert (GNUNET_SYSERR == |
245 | GNUNET_BIO_read (fileR, "Read error", readResult, 65537)); | 257 | GNUNET_BIO_read (fileR, "Read error", readResult, 65537)); |
258 | readResultString = NULL; | ||
246 | GNUNET_assert (GNUNET_SYSERR == | 259 | GNUNET_assert (GNUNET_SYSERR == |
247 | GNUNET_BIO_read_string (fileR, "Read string error", | 260 | GNUNET_BIO_read_string (fileR, "Read string error", |
248 | &readResultString, 200)); | 261 | &readResultString, 200)); |
262 | GNUNET_assert (NULL == readResultString); | ||
249 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_int64 (fileR, &testNum)); | 263 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_int64 (fileR, &testNum)); |
250 | GNUNET_assert (GNUNET_SYSERR == | 264 | GNUNET_assert (GNUNET_SYSERR == |
251 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", | 265 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", |
252 | &metaDataR)); | 266 | &metaDataR)); |
267 | msg = NULL; | ||
253 | GNUNET_BIO_read_close (fileR, &msg); | 268 | GNUNET_BIO_read_close (fileR, &msg); |
269 | GNUNET_free (msg); | ||
254 | GNUNET_CONTAINER_meta_data_destroy (metaDataR); | 270 | GNUNET_CONTAINER_meta_data_destroy (metaDataR); |
255 | GNUNET_CONTAINER_meta_data_destroy (metaDataW); | 271 | GNUNET_CONTAINER_meta_data_destroy (metaDataW); |
256 | return 0; | 272 | return 0; |
@@ -276,7 +292,9 @@ test_fakestring_rw () | |||
276 | GNUNET_assert (GNUNET_SYSERR == | 292 | GNUNET_assert (GNUNET_SYSERR == |
277 | GNUNET_BIO_read_string (fileR, "Read string error", | 293 | GNUNET_BIO_read_string (fileR, "Read string error", |
278 | &readResult, 200)); | 294 | &readResult, 200)); |
295 | msg = NULL; | ||
279 | GNUNET_BIO_read_close (fileR, &msg); | 296 | GNUNET_BIO_read_close (fileR, &msg); |
297 | GNUNET_free (msg); | ||
280 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); | 298 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); |
281 | GNUNET_free (fileName); | 299 | GNUNET_free (fileName); |
282 | return 0; | 300 | return 0; |
@@ -291,7 +309,6 @@ test_fakemeta_rw () | |||
291 | struct GNUNET_BIO_ReadHandle *fileR; | 309 | struct GNUNET_BIO_ReadHandle *fileR; |
292 | char *fileName = GNUNET_DISK_mktemp ("gnunet_bio"); | 310 | char *fileName = GNUNET_DISK_mktemp ("gnunet_bio"); |
293 | struct GNUNET_CONTAINER_MetaData *metaDataR; | 311 | struct GNUNET_CONTAINER_MetaData *metaDataR; |
294 | metaDataR = GNUNET_CONTAINER_meta_data_create (); | ||
295 | 312 | ||
296 | fileW = GNUNET_BIO_write_open (fileName); | 313 | fileW = GNUNET_BIO_write_open (fileName); |
297 | GNUNET_assert (NULL != fileW); | 314 | GNUNET_assert (NULL != fileW); |
@@ -300,12 +317,15 @@ test_fakemeta_rw () | |||
300 | 317 | ||
301 | fileR = GNUNET_BIO_read_open (fileName); | 318 | fileR = GNUNET_BIO_read_open (fileName); |
302 | GNUNET_assert (NULL != fileR); | 319 | GNUNET_assert (NULL != fileR); |
320 | metaDataR = NULL; | ||
303 | GNUNET_assert (GNUNET_SYSERR == | 321 | GNUNET_assert (GNUNET_SYSERR == |
304 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", | 322 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", |
305 | &metaDataR)); | 323 | &metaDataR)); |
324 | GNUNET_assert (NULL == metaDataR); | ||
325 | msg = NULL; | ||
306 | GNUNET_BIO_read_close (fileR, &msg); | 326 | GNUNET_BIO_read_close (fileR, &msg); |
327 | GNUNET_free (msg); | ||
307 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); | 328 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); |
308 | GNUNET_CONTAINER_meta_data_destroy (metaDataR); | ||
309 | GNUNET_free (fileName); | 329 | GNUNET_free (fileName); |
310 | return 0; | 330 | return 0; |
311 | } | 331 | } |
@@ -319,7 +339,6 @@ test_fakebigmeta_rw () | |||
319 | struct GNUNET_BIO_ReadHandle *fileR; | 339 | struct GNUNET_BIO_ReadHandle *fileR; |
320 | char *fileName = GNUNET_DISK_mktemp ("gnunet_bio"); | 340 | char *fileName = GNUNET_DISK_mktemp ("gnunet_bio"); |
321 | struct GNUNET_CONTAINER_MetaData *metaDataR; | 341 | struct GNUNET_CONTAINER_MetaData *metaDataR; |
322 | metaDataR = GNUNET_CONTAINER_meta_data_create (); | ||
323 | 342 | ||
324 | fileW = GNUNET_BIO_write_open (fileName); | 343 | fileW = GNUNET_BIO_write_open (fileName); |
325 | GNUNET_assert (NULL != fileW); | 344 | GNUNET_assert (NULL != fileW); |
@@ -328,12 +347,15 @@ test_fakebigmeta_rw () | |||
328 | 347 | ||
329 | fileR = GNUNET_BIO_read_open (fileName); | 348 | fileR = GNUNET_BIO_read_open (fileName); |
330 | GNUNET_assert (NULL != fileR); | 349 | GNUNET_assert (NULL != fileR); |
350 | metaDataR = NULL; | ||
331 | GNUNET_assert (GNUNET_SYSERR == | 351 | GNUNET_assert (GNUNET_SYSERR == |
332 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", | 352 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", |
333 | &metaDataR)); | 353 | &metaDataR)); |
354 | msg = NULL; | ||
334 | GNUNET_BIO_read_close (fileR, &msg); | 355 | GNUNET_BIO_read_close (fileR, &msg); |
356 | GNUNET_free (msg); | ||
335 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); | 357 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (fileName)); |
336 | GNUNET_CONTAINER_meta_data_destroy (metaDataR); | 358 | GNUNET_assert (NULL == metaDataR); |
337 | GNUNET_free (fileName); | 359 | GNUNET_free (fileName); |
338 | return 0; | 360 | return 0; |
339 | } | 361 | } |