[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1636-gb3573a4

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  b3573a49034a01ac81c3ad4041519ac36cb7e1b6 (commit)
      from  c5f757809a5cf900c401c2b38b7bdaa8c6c29983 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=b3573a49034a01ac81c3ad4041519ac36cb7e1b6


commit b3573a49034a01ac81c3ad4041519ac36cb7e1b6
Author: Bastiaan Jacques <address@hidden>
Date:   Wed Jul 3 21:26:30 2013 +0200

    Fix mismatched delete/delete[].

diff --git a/libbase/Socket.cpp b/libbase/Socket.cpp
index 2bb3484..49ad3fd 100644
--- a/libbase/Socket.cpp
+++ b/libbase/Socket.cpp
@@ -29,7 +29,7 @@
 #include <csignal>
 #include <boost/lexical_cast.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/shared_array.hpp>
             
 #include "GnashSystemNetHeaders.h"
 #include "GnashSystemFDHeaders.h"
@@ -197,7 +197,7 @@ Socket::connect(const std::string& hostname, 
boost::uint16_t port)
                     clientservice, sizeof(clientservice),
                     NI_NUMERICHOST);
         
-        boost::shared_ptr<char> straddr = getIPString(ot);
+        boost::shared_array<char> straddr = getIPString(ot);
         
         if (ot->ai_family == AF_INET6) {
             log_debug("%s has IPV6 address of: %s", hostname, straddr.get());
@@ -303,10 +303,10 @@ Socket::connect(const std::string& hostname, 
boost::uint16_t port)
 }
 
 // Return the string representation of the IPV4 or IPV6 number
-boost::shared_ptr<char>
+boost::shared_array<char>
 Socket::getIPString(struct addrinfo *ai)
 {
-    boost::shared_ptr<char> straddr(new char[INET6_ADDRSTRLEN]);
+    boost::shared_array<char> straddr(new char[INET6_ADDRSTRLEN]);
     std::memset(straddr.get(), 0, INET6_ADDRSTRLEN);    
     if (ai->ai_family == AF_INET6) {
         struct sockaddr_in6 *sock6 = reinterpret_cast<struct sockaddr_in6 
*>(ai->ai_addr);
diff --git a/libbase/Socket.h b/libbase/Socket.h
index 6bef010..149fc0c 100644
--- a/libbase/Socket.h
+++ b/libbase/Socket.h
@@ -23,7 +23,7 @@
 
 #include "dsodefs.h"
 #include <boost/cstdint.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/shared_array.hpp>
 #include "IOChannel.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -124,7 +124,7 @@ public:
 private:
 
     // Return the string representation of the IPV4 or IPV6 number
-    boost::shared_ptr<char> getIPString(struct addrinfo *ai);
+    boost::shared_array<char> getIPString(struct addrinfo *ai);
        
     /// Fill the cache.
     void fillCache();

-----------------------------------------------------------------------

Summary of changes:
 libbase/Socket.cpp |    8 ++++----
 libbase/Socket.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash