Fixed a null pointer dereference that could be triggered by using non…

…-standard service definitions. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@136 0da03de8-d603-11dd-86c2-0f8696b7b6f9
bjornhanson · Jul 4, 2009 · cedb046 · cedb046
1 parent 9713e1d
commit cedb046
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/config.h b/config.h
@@ -132,7 +132,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "135"
+#define VCS_REVISION "136"
 
 /* Version number of package */
 #define VERSION "2.8"

diff --git a/configure b/configure
@@ -2037,7 +2037,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=135
+VCS_REVISION=136
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.8, [email protected])
-VCS_REVISION=135
+VCS_REVISION=136
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])

diff --git a/demo/vt100.js b/demo/vt100.js
@@ -1636,7 +1636,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.8 (revision 135)" +
+  alert("VT100 Terminal Emulator " + "2.8 (revision 136)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/libhttp/trie.c b/libhttp/trie.c
@@ -183,7 +183,7 @@ char *getFromTrie(const struct Trie *trie, const char *key, char **diff) {
   for (;;) {
     if (trie->idx > 0) {
       if (memcmp(trie->key, key, trie->idx)) {
-        if (diff) {
+        if (diff && partial != NULL) {
           *diff        = partialKey;
           return partial->value;
         }

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
@@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.8 (revision 135)" +
+  alert("Shell In A Box version " + "2.8 (revision 136)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
@@ -1636,7 +1636,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.8 (revision 135)" +
+  alert("VT100 Terminal Emulator " + "2.8 (revision 136)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };