gigablast/open-source-search-engine
1
0
Fork 0
mirror of https://github.com/gigablast/open-source-search-engine.git synced 2024-10-04 20:27:43 +03:00
Code Issues Projects Releases Wiki Activity

fix injection bugs

Browse Source
This commit is contained in:
Matt Wells 2014-06-18 06:22:19 -07:00
parent 91df090d1d
commit 82be2ba28a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DiskPageCache.cpp
View File

@ -28,7 +28,7 @@ DiskPageCache::DiskPageCache () {
// sometimes db may pass an unitialized DiskPageCache to a BigFile
// so make sure when BigFile::close calls DiskPageCache::rmVfd() our
// m_memOff vector is all NULLed out, otherwise it will core
memset ( m_memOff , 0 , 4 * MAX_NUM_VFDS2 );
memset ( m_memOff , 0 , sizeof(long *) * MAX_NUM_VFDS2 );
m_availMemOff = NULL;
//m_isOverriden = false;
reset();

15
Parms.cpp
View File

@ -2628,11 +2628,15 @@ void Parms::setParm ( char *THIS , Parm *m , long mm , long j , char *s ,
float oldVal = 0;
float newVal = 0;
if ( ! s && m->m_type != TYPE_CHARPTR && m->m_defOff==-1) {
if ( ! s &&
m->m_type != TYPE_CHARPTR &&
m->m_type != TYPE_FILEUPLOADBUTTON &&
m->m_defOff==-1) {
s = "0";
char *tit = m->m_title;
if ( ! tit || ! tit[0] ) tit = m->m_xml;
log(LOG_LOGIC,"admin: Parm \"%s\" had NULL default value.",
log(LOG_LOGIC,"admin: Parm \"%s\" had NULL default value. "
"Forcing to 0.",
tit);
//char *xx = NULL; *xx = 0;
}
@ -2916,8 +2920,9 @@ void Parms::setToDefault ( char *THIS , char objType , CollectionRec *argcr ) {
if ( m->m_obj != objType ) continue;
if ( m->m_obj == OBJ_NONE ) continue;
if ( m->m_type == TYPE_COMMENT ) continue;
if ( m->m_type == TYPE_FILEUPLOADBUTTON )
continue;
// no, we gotta set GigablastRequest::m_contentFile to NULL
//if ( m->m_type == TYPE_FILEUPLOADBUTTON )
// continue;
if ( m->m_type == TYPE_MONOD2 ) continue;
if ( m->m_type == TYPE_MONOM2 ) continue;
if ( m->m_type == TYPE_CMD ) continue;
@ -5151,6 +5156,7 @@ void Parms::init ( ) {
m->m_page = PAGE_BASIC_SETTINGS;
m->m_obj = OBJ_COLL;
m->m_off = 0;
m->m_def = NULL;
m->m_type = TYPE_FILEUPLOADBUTTON;
m->m_flags = PF_NOSAVE | PF_DUP;
m++;
@ -13355,6 +13361,7 @@ void Parms::init ( ) {
m->m_cgi = "urls";
m->m_page = PAGE_ADDURL2;
m->m_obj = OBJ_NONE;
m->m_def = NULL;
m->m_type = TYPE_FILEUPLOADBUTTON;
m++;
*/