FIX: net/ices2 double-free()

[Moritz Grimm]

Hello,

the attached patch fixes "don't shout_close() something that has been 
shout_close()'d before" that I stumbled upon in net/ices2 and can be 
simply added to patches/ there. The fix is from upstream.

Please forgive me for not supplying a patch for the PKGNAME bump in 
Makefile, I figured that applying the patch is more work than simply 
changing one number in the file. Please let me know if you want such 
patches in the future.


Moritz
$OpenBSD$
--- src/stream.c.orig   Fri Nov  5 20:19:54 2004
+++ src/stream.c        Tue Oct 18 14:45:00 2005
@@ -295,9 +295,10 @@ void *ices_instance_stream(void *arg)
                             stream->reconnect_attempts==-1) && 
                             !ices_config->shutdown)
                     {
-                        i++;
                         LOG_WARN0("Trying reconnect after server socket 
error");
-                        shout_close(sdsc->shout);
+                        if(i == 0)
+                            shout_close(sdsc->shout);
+                        i++;
                         if((shouterr = shout_open(sdsc->shout)) == 
SHOUTERR_SUCCESS)
                         {
                             LOG_INFO3("Connected to server: %s:%d%s", 
@@ -329,6 +330,7 @@ void *ices_instance_stream(void *arg)
                             }
                             else /* Don't try again too soon */
                                 thread_sleep 
(stream->reconnect_delay*1000000); 
+                            sdsc->shout = NULL;
                         }
                     }
                     stream->skip = 0;