Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-26 18:35:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.187.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-04-08 00:50:30 +02:00
parent 7b2d037d62
commit 4a2c11111f
2 changed files with 16 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -132,13 +132,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.187 (2016-04-07)" #define Log_PLATFORM_VERSION "SWAD 15.187.1 (2016-04-08)"
#define CSS_FILE "swad15.186.css" #define CSS_FILE "swad15.186.css"
#define JS_FILE "swad15.186.js" #define JS_FILE "swad15.186.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.187.1: Apr 08, 2016 Code optimization in function to change format of string. (198872 lines)
Version 15.187: Apr 07, 2016 Fixed bug in forms sent using content type multipart/form-data. (198938 lines) Version 15.187: Apr 07, 2016 Fixed bug in forms sent using content type multipart/form-data. (198938 lines)
Version 15.186: Apr 07, 2016 Changes in edition of a test question. (198840 lines) Version 15.186: Apr 07, 2016 Changes in edition of a test question. (198840 lines)
Version 15.185.4: Apr 07, 2016 Changes in edition of a test question. (198832 lines) Version 15.185.4: Apr 07, 2016 Changes in edition of a test question. (198832 lines)

94
swad_string.c
View File

@ -937,6 +937,7 @@ void Str_ChangeFormat (Str_ChangeFrom_t ChangeFrom,Str_ChangeTo_t ChangeTo,
char *StrDst; char *StrDst;
char *PtrSrc; char *PtrSrc;
char *PtrDst; char *PtrDst;
unsigned char Ch;
unsigned int SpecialChar; unsigned int SpecialChar;
size_t LengthSpecStrSrc = 0; size_t LengthSpecStrSrc = 0;
size_t LengthSpecStrDst; size_t LengthSpecStrDst;
@ -966,91 +967,38 @@ void Str_ChangeFormat (Str_ChangeFrom_t ChangeFrom,Str_ChangeTo_t ChangeTo,
for (PtrSrc = Str, PtrDst = StrDst; for (PtrSrc = Str, PtrDst = StrDst;
*PtrSrc;) *PtrSrc;)
{ {
Ch = (unsigned char) *PtrSrc;
switch (ChangeFrom) switch (ChangeFrom)
{ {
case Str_FROM_FORM: case Str_FROM_FORM:
if (Gbl.ContentReceivedByCGI == Act_CONTENT_DATA) if (Gbl.ContentReceivedByCGI == Act_CONTENT_DATA)
{
// The form contained data and was sent with content type multipart/form-data // The form contained data and was sent with content type multipart/form-data
switch ((unsigned char) *PtrSrc) switch (Ch)
{ {
case 0x20: /* Space */ case 0x20: /* Space */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x20;
break;
case 0x22: /* Change double comilla --> """ */ case 0x22: /* Change double comilla --> """ */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x22;
break;
case 0x23: /* '#' */ case 0x23: /* '#' */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x23;
break;
case 0x26: /* Change '&' --> "&" */ case 0x26: /* Change '&' --> "&" */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x26;
break;
case 0x27: /* Change single comilla --> "'" to avoid SQL code injection */ case 0x27: /* Change single comilla --> "'" to avoid SQL code injection */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x27;
break;
case 0x2C: /* ',' */ case 0x2C: /* ',' */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x2C;
break;
case 0x2F: /* '/' */ case 0x2F: /* '/' */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x2F;
break;
case 0x3A: /* ':' */ case 0x3A: /* ':' */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x3A;
break;
case 0x3B: /* ';' */ case 0x3B: /* ';' */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x3B;
break;
case 0x3C: /* '<' --> "&#60;" */ case 0x3C: /* '<' --> "&#60;" */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x3C;
break;
case 0x3E: /* '>' --> "&#62;" */ case 0x3E: /* '>' --> "&#62;" */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x3E;
break;
case 0x3F: /* '?' */ case 0x3F: /* '?' */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x3F;
break;
case 0x40: /* '@' */ case 0x40: /* '@' */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x40;
break;
case 0x5C: /* '\\' */ case 0x5C: /* '\\' */
IsSpecialChar = true; IsSpecialChar = true;
LengthSpecStrSrc = 1; LengthSpecStrSrc = 1;
SpecialChar = 0x5C; SpecialChar = (unsigned int) Ch;
break; break;
default: default:
if ((unsigned char) *PtrSrc < 0x20 || if (Ch < 0x20 || Ch > 0x7F)
(unsigned char) *PtrSrc > 0x7F)
{ {
IsSpecialChar = true; IsSpecialChar = true;
LengthSpecStrSrc = 1; LengthSpecStrSrc = 1;
SpecialChar = (unsigned int) (unsigned char) *PtrSrc; SpecialChar = (unsigned int) Ch;
} }
else else
{ {
@ -1060,11 +1008,9 @@ void Str_ChangeFormat (Str_ChangeFrom_t ChangeFrom,Str_ChangeTo_t ChangeTo,
} }
break; break;
} }
}
else // Gbl.ContentReceivedByCGI == Act_CONTENT_NORM else // Gbl.ContentReceivedByCGI == Act_CONTENT_NORM
{
// The form contained text and was sent with content type application/x-www-form-urlencoded // The form contained text and was sent with content type application/x-www-form-urlencoded
switch ((unsigned char) *PtrSrc) switch (Ch)
{ {
case '+': /* Change every '+' to a space */ case '+': /* Change every '+' to a space */
IsSpecialChar = true; IsSpecialChar = true;
@ -1077,14 +1023,10 @@ void Str_ChangeFormat (Str_ChangeFrom_t ChangeFrom,Str_ChangeTo_t ChangeTo,
LengthSpecStrSrc = 3; LengthSpecStrSrc = 3;
break; break;
case 0x27: /* Change single comilla --> "&#39;" to avoid SQL code injection */ case 0x27: /* Change single comilla --> "&#39;" to avoid SQL code injection */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x27;
break;
case 0x5C: /* '\\' */ case 0x5C: /* '\\' */
IsSpecialChar = true; IsSpecialChar = true;
LengthSpecStrSrc = 1; LengthSpecStrSrc = 1;
SpecialChar = 0x5C; SpecialChar = (unsigned int) Ch;
break; break;
default: default:
IsSpecialChar = false; IsSpecialChar = false;
@ -1092,33 +1034,24 @@ void Str_ChangeFormat (Str_ChangeFrom_t ChangeFrom,Str_ChangeTo_t ChangeTo,
ThereIsSpaceChar = false; ThereIsSpaceChar = false;
break; break;
} }
}
break; break;
case Str_FROM_HTML: case Str_FROM_HTML:
case Str_FROM_TEXT: case Str_FROM_TEXT:
switch ((unsigned char) *PtrSrc) switch (Ch)
{ {
case 0x20: /* Space */ case 0x20: /* Space */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x20;
break;
case 0x27: /* Change single comilla --> "&#39;" to avoid SQL code injection */ case 0x27: /* Change single comilla --> "&#39;" to avoid SQL code injection */
IsSpecialChar = true;
LengthSpecStrSrc = 1;
SpecialChar = 0x27;
break;
case 0x5C: /* '\\' */ case 0x5C: /* '\\' */
IsSpecialChar = true; IsSpecialChar = true;
LengthSpecStrSrc = 1; LengthSpecStrSrc = 1;
SpecialChar = 0x5C; SpecialChar = (unsigned int) Ch;
break; break;
default: default:
if ((unsigned char) *PtrSrc < 0x20) if (Ch < 0x20)
{ {
IsSpecialChar = true; IsSpecialChar = true;
LengthSpecStrSrc = 1; LengthSpecStrSrc = 1;
SpecialChar = (unsigned int) (unsigned char) *PtrSrc; SpecialChar = (unsigned int) Ch;
} }
else else
{ {
@ -1130,6 +1063,7 @@ void Str_ChangeFormat (Str_ChangeFrom_t ChangeFrom,Str_ChangeTo_t ChangeTo,
} }
break; break;
} }
if (IsSpecialChar) if (IsSpecialChar)
{ {
switch (SpecialChar) switch (SpecialChar)