simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
service definitions.


git-svn-id: https://shellinabox.googlecode.com/svn/trunk@136 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac 2009-07-04 08:46:28 +00:00
parent 9713e1d58c
commit cedb046244
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.h
View file

@ -132,7 +132,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "135" #define VCS_REVISION "136"
/* Version number of package */ /* Version number of package */
#define VERSION "2.8" #define VERSION "2.8"

2
configure vendored
View file

@ -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 ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=135 VCS_REVISION=136
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.8, markus@shellinabox.com) AC_INIT(shellinabox, 2.8, markus@shellinabox.com)
VCS_REVISION=135 VCS_REVISION=136
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

2
demo/vt100.js
View file

@ -1636,7 +1636,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };

2
libhttp/trie.c
View file

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

2
shellinabox/shell_in_a_box.js
View file

@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" + "For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

2
shellinabox/vt100.js
View file

@ -1636,7 +1636,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };