Fix several problems reported by valgrind

Initialize sock_fd in constructor

Add destructors to free allocated memory

Don't call exit() so the destructors actually get executed

diff --git a/flavors/gl/source/bufferstate.cpp b/flavors/gl/source/bufferstate.cpp
index e48d221df6458375335dd7a29e9c2f81d1e72550..467fb932b0c4573951b3bcc7d2893b54b046c4c7 100644 (file)
--- a/flavors/gl/source/bufferstate.cpp
+++ b/flavors/gl/source/bufferstate.cpp
@@ -137,6 +137,11 @@ BufferState::BufferState():
        data(0)
 { }
 
        data(0)
 { }
 

+BufferState::~BufferState()
+{
+       delete[] data;
+}
+

 void BufferState::set_data(unsigned sz, const void *ptr, GLenum use)
 {
        usage = use;
 void BufferState::set_data(unsigned sz, const void *ptr, GLenum use)
 {
        usage = use;

diff --git a/flavors/gl/source/bufferstate.h b/flavors/gl/source/bufferstate.h
index 18013a77dfb29445ee20271ada9543eaa6ca42f0..6cff3feaf55d2f8f20d85cbd1211c9cbd27d3926 100644 (file)
--- a/flavors/gl/source/bufferstate.h
+++ b/flavors/gl/source/bufferstate.h
@@ -27,6 +27,7 @@ struct BufferContent
        std::vector<Array> arrays;
 
        BufferContent();
        std::vector<Array> arrays;
 
        BufferContent();

+

        void update(const ArrayState &);
        void update_elements(GLenum);
        std::string describe() const;
        void update(const ArrayState &);
        void update_elements(GLenum);
        std::string describe() const;


@@ -42,6 +43,8 @@ struct BufferState
        BufferContent content;
 
        BufferState();
        BufferContent content;
 
        BufferState();

+       ~BufferState();
+

        void set_data(unsigned, const void *, GLenum);
        void set_sub_data(unsigned, unsigned, const void *);
        std::string describe() const;
        void set_data(unsigned, const void *, GLenum);
        void set_sub_data(unsigned, unsigned, const void *);
        std::string describe() const;

diff --git a/flavors/gl/source/inspector.cpp b/flavors/gl/source/inspector.cpp
index b6456ce7ec1afcfabf52e8b995bb2840cde1e38d..6ff3f7033fa86180b2317f85f2e2d6a443f5800b 100644 (file)
--- a/flavors/gl/source/inspector.cpp
+++ b/flavors/gl/source/inspector.cpp
@@ -57,6 +57,11 @@ Inspector::Inspector(GlDbg &d):
        decoder->gldBreak = gldBreak;
 }
 
        decoder->gldBreak = gldBreak;
 }
 

+Inspector::~Inspector()
+{
+       gldecoder_delete(decoder);
+}
+

 void Inspector::decode(const char *data, unsigned len)
 {
        if(query_state)
 void Inspector::decode(const char *data, unsigned len)
 {
        if(query_state)

diff --git a/flavors/gl/source/inspector.h b/flavors/gl/source/inspector.h
index 3088a75d39590e0aa39e68db76b54a087baa4f5e..15135297c32328bb29a5d9e1b33d58e5655c9147 100644 (file)
--- a/flavors/gl/source/inspector.h
+++ b/flavors/gl/source/inspector.h
@@ -14,6 +14,7 @@ private:
 
 public:
        Inspector(GlDbg &);
 
 public:
        Inspector(GlDbg &);

+       ~Inspector();

 
        virtual void decode(const char *, unsigned);
        virtual void process_started();
 
        virtual void decode(const char *, unsigned);
        virtual void process_started();

diff --git a/flavors/gl/source/profiler.cpp b/flavors/gl/source/profiler.cpp
index 3eb78f2d1efcf725cf7935582bd5dc13cff7edad..94496023ecf1f52178fa655f92a7b9a45774cf8e 100644 (file)
--- a/flavors/gl/source/profiler.cpp
+++ b/flavors/gl/source/profiler.cpp
@@ -21,6 +21,11 @@ Profiler::Profiler(GlDbg &dbg):
        decoder->glXSwapBuffers = glXSwapBuffers;
 }
 
        decoder->glXSwapBuffers = glXSwapBuffers;
 }
 

+Profiler::~Profiler()
+{
+       gldecoder_delete(decoder);
+}
+

 void Profiler::decode(const char *data, unsigned len)
 {
        if(enabled)
 void Profiler::decode(const char *data, unsigned len)
 {
        if(enabled)

diff --git a/flavors/gl/source/profiler.h b/flavors/gl/source/profiler.h
index cd4af7d09d8bcddbd5e1ec401fe64771d150553b..7605fbcadc8e74fbf1e7067dea56a33926d6968f 100644 (file)
--- a/flavors/gl/source/profiler.h
+++ b/flavors/gl/source/profiler.h
@@ -19,6 +19,7 @@ private:
 
 public:
        Profiler(GlDbg &);
 
 public:
        Profiler(GlDbg &);

+       ~Profiler();

 
        virtual void decode(const char *, unsigned);
 private:
 
        virtual void decode(const char *, unsigned);
 private:

diff --git a/source/commandinterpreter.cpp b/source/commandinterpreter.cpp
index d3db5a49412ad8b19f01b55702b9fbf19f0cd898..b8a10a99d03cb0f30a4048c4754f370d42f09f8b 100644 (file)
--- a/source/commandinterpreter.cpp
+++ b/source/commandinterpreter.cpp
@@ -53,6 +53,12 @@ CommandInterpreter::CommandInterpreter(GlDbg &d):
 
 }
 
 
 }
 

+CommandInterpreter::~CommandInterpreter()
+{
+       for(CommandMap::iterator i=commands.begin(); i!=commands.end(); ++i)
+               delete i->second;
+}
+

 void CommandInterpreter::execute(const string &cmd)
 {
        unsigned space = cmd.find(' ');
 void CommandInterpreter::execute(const string &cmd)
 {
        unsigned space = cmd.find(' ');

diff --git a/source/commandinterpreter.h b/source/commandinterpreter.h
index fa881c6883be885b6e2cc03974448e68783766fd..ca5060b4d50f42e4757cadc0f40cf12d5a49f5ad 100644 (file)
--- a/source/commandinterpreter.h
+++ b/source/commandinterpreter.h
@@ -64,6 +64,7 @@ private:
 
 public:
        CommandInterpreter(GlDbg &);
 
 public:
        CommandInterpreter(GlDbg &);

+       ~CommandInterpreter();

 
        template<typename T>
        Command &register_command(const std::string &n, T *o, void (T::*f)(const std::string &))
 
        template<typename T>
        Command &register_command(const std::string &n, T *o, void (T::*f)(const std::string &))

diff --git a/source/gldbg.cpp b/source/gldbg.cpp
index 4bc169fcd0079abb2f99811a87db777266e4e86f..c13d5cc2fa6bbafb1b42c87b38139cf78fd58c10 100644 (file)
--- a/source/gldbg.cpp
+++ b/source/gldbg.cpp
@@ -20,8 +20,10 @@ using namespace std;
 GlDbg *GlDbg::instance = 0;
 
 GlDbg::GlDbg(int argc, char **argv):
 GlDbg *GlDbg::instance = 0;
 
 GlDbg::GlDbg(int argc, char **argv):

+       done(false),

        cmd_interp(*this),
        process(vector<string>(argv+1, argv+argc)),
        cmd_interp(*this),
        process(vector<string>(argv+1, argv+argc)),

+       sock_fd(-1),

        buf_offset(0),
        flushing(false),
        got_sigchld(false),
        buf_offset(0),
        flushing(false),
        got_sigchld(false),


@@ -56,7 +58,7 @@ int GlDbg::main()
        printf("Copyright © 2009-2010 Mikkosoft Productions\n");
        printf("Type \"help\" for a list of commands\n");
 
        printf("Copyright © 2009-2010 Mikkosoft Productions\n");
        printf("Type \"help\" for a list of commands\n");
 

-       while(1)
+       while(!done)

                tick();
 
        return 0;
                tick();
 
        return 0;


@@ -179,7 +181,7 @@ void GlDbg::quit(bool force)
 {
        if(!force && process.get_state()!=Process::INACTIVE)
                throw runtime_error("Program is still running");
 {
        if(!force && process.get_state()!=Process::INACTIVE)
                throw runtime_error("Program is still running");

-       exit(0);
+       done = true;

 }
 
 void GlDbg::tick()
 }
 
 void GlDbg::tick()


@@ -225,7 +227,7 @@ void GlDbg::tick()
                        free(line);
                }
                else if(pstate==Process::INACTIVE)
                        free(line);
                }
                else if(pstate==Process::INACTIVE)

-                       exit(0);
+                       done = true;

        }
 }
 
        }
 }
 

diff --git a/source/gldbg.h b/source/gldbg.h
index 3a2bcd1a718535fdba44b00f6d2018f423df74a3..9f77430e753ec54f13f31b7d504cd14831086dbb 100644 (file)
--- a/source/gldbg.h
+++ b/source/gldbg.h
@@ -30,6 +30,7 @@ private:
 
        typedef std::list<Breakpoint> BreakList;
 
 
        typedef std::list<Breakpoint> BreakList;
 

+       bool done;

        CommandInterpreter cmd_interp;
        Process process;
        int sock_fd;
        CommandInterpreter cmd_interp;
        Process process;
        int sock_fd;

diff --git a/source/grabber.cpp b/source/grabber.cpp
index 746cffa876d488ba130abb1c4080004d4dfcf62a..c7f34ab92d8e002c59d66cca1bd45cc33b410b9a 100644 (file)
--- a/source/grabber.cpp
+++ b/source/grabber.cpp
@@ -39,6 +39,11 @@ Grabber::Grabber(GlDbg &g):
        flavor_init();
 }
 
        flavor_init();
 }
 

+Grabber::~Grabber()
+{
+       gldecoder_delete(decoder);
+}
+

 void Grabber::decode(const char *data, unsigned len)
 {
        gldecoder_decode(decoder, data, len);
 void Grabber::decode(const char *data, unsigned len)
 {
        gldecoder_decode(decoder, data, len);

diff --git a/source/grabber.h b/source/grabber.h
index 370108dda0b80f0d303b95bae9a7f51ccada3e87..f92b15596da34949980dc0a55f8824216f2b21b6 100644 (file)
--- a/source/grabber.h
+++ b/source/grabber.h
@@ -20,6 +20,7 @@ private:
 
 public:
        Grabber(GlDbg &);
 
 public:
        Grabber(GlDbg &);

+       ~Grabber();

 private:
        void flavor_init();
 
 private:
        void flavor_init();