[Mod-c-cvs] ehtml/src Container.cpp, 1.9, 1.10 Input.cpp, 1.7, 1.8 Label.cpp, 1.6, 1.7 Makefile.in, 1.4, 1.5 Page.cpp, 1.9, 1.10 Request.cpp, 1.4, 1.5

[Matej U. <mat...@us...>]

Update of /cvsroot/mod-c/ehtml/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16048/src

Modified Files:
	Container.cpp Input.cpp Label.cpp Makefile.in Page.cpp 
	Request.cpp 
Log Message:
- prevent a null dereference in Label.cpp
- ParseHeader did not check keys correctly in Request.cpp


Index: Label.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/Label.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Label.cpp	6 Mar 2006 08:00:36 -0000	1.6
--- Label.cpp	23 Aug 2006 10:32:57 -0000	1.7
***************
*** 42,46 ****
  {
      Text = str;
!     TagHandler.SetHasContents( *str );
  }
  
--- 42,46 ----
  {
      Text = str;
!     TagHandler.SetHasContents( !Text.empty() );
  }
  

Index: Page.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/Page.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Page.cpp	6 Mar 2006 08:00:36 -0000	1.9
--- Page.cpp	23 Aug 2006 10:32:57 -0000	1.10
***************
*** 19,22 ****
--- 19,24 ----
   ***************************************************************************/
  
+ // This class uses some HTTPD's structures (in the Render method)
+ 
  #include <stdlib.h>
  #include <Page.h>

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in	15 Feb 2006 19:54:36 -0000	1.4
--- Makefile.in	23 Aug 2006 10:32:57 -0000	1.5
***************
*** 1,3 ****
! # Makefile.in generated by automake 1.9.5 from Makefile.am.
  # @configure_input@
  
--- 1,3 ----
! # Makefile.in generated by automake 1.9.6 from Makefile.am.
  # @configure_input@
  
***************
*** 23,28 ****
  # EHTML_INCLUDE_DIR is the include directory where EHTML header files are stored
  
- SOURCES = $(libehtml_la_SOURCES)
- 
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
--- 23,26 ----

Index: Request.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/Request.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Request.cpp	6 Mar 2006 08:00:36 -0000	1.4
--- Request.cpp	23 Aug 2006 10:32:57 -0000	1.5
***************
*** 142,146 ****
                          {
                              // Check whether it is a cookie or the content length
!                             if ( *( _key + 1 ) )
                              {
                                  // Look at the third character
--- 142,146 ----
                          {
                              // Check whether it is a cookie or the content length
!                             if ( *( _key + 1 ) == 'o' )
                              {
                                  // Look at the third character

Index: Input.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/Input.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Input.cpp	6 Mar 2006 08:00:36 -0000	1.7
--- Input.cpp	23 Aug 2006 10:32:57 -0000	1.8
***************
*** 167,171 ****
              SetValue( *_postedVal );
      }
!     
      // If the name hasn't been set yet, set it automatically
      if ( NameAttr.GetValue().empty() )
--- 167,171 ----
              SetValue( *_postedVal );
      }
! 
      // If the name hasn't been set yet, set it automatically
      if ( NameAttr.GetValue().empty() )

Index: Container.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/Container.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Container.cpp	4 Mar 2006 11:24:09 -0000	1.9
--- Container.cpp	23 Aug 2006 10:32:57 -0000	1.10
***************
*** 66,70 ****
      int len;
      char buf[32];
!     
      // If there is an id use it for hierarchy formatted IDs
      if ( ( len = _tmpId.length() ) )
--- 66,70 ----
      int len;
      char buf[32];
! 
      // If there is an id use it for hierarchy formatted IDs
      if ( ( len = _tmpId.length() ) )
***************
*** 77,81 ****
              int _tmpLen = snprintf( buf, 32, "%d", CurrentId++ );
              sb.sputn( buf, _tmpLen );
!             
              (*itr)->SetId( sb.str() );
          }
--- 77,81 ----
              int _tmpLen = snprintf( buf, 32, "%d", CurrentId++ );
              sb.sputn( buf, _tmpLen );
! 
              (*itr)->SetId( sb.str() );
          }