Added valid char check, not only use checksum (#18094)

This commit is contained in:
Charles 2023-03-03 08:42:12 +01:00 committed by GitHub
parent fe46f4d654
commit eb62555946
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 7 deletions

View File

@ -691,22 +691,51 @@ LF etiquette HT donnee HT Chk CR
====================================================================== */ ====================================================================== */
unsigned char TInfo::calcChecksum(char *etiquette, char *valeur, char * horodate) unsigned char TInfo::calcChecksum(char *etiquette, char *valeur, char * horodate)
{ {
char c;
uint8_t sum = (_mode == TINFO_MODE_HISTORIQUE) ? _separator : (2 * _separator); // Somme des codes ASCII du message + 2 separateurs uint8_t sum = (_mode == TINFO_MODE_HISTORIQUE) ? _separator : (2 * _separator); // Somme des codes ASCII du message + 2 separateurs
// avoid dead loop, always check all is fine // avoid dead loop, always check all is fine
if (etiquette && valeur) { if (etiquette && valeur) {
// this will not hurt and may save our life ;-) // this will not hurt and may save our life ;-)
if (strlen(etiquette) && strlen(valeur)) { if (strlen(etiquette) && strlen(valeur)) {
while (*etiquette) while (*etiquette) {
sum += *etiquette++ ; c =*etiquette++;
// Add another validity check since checksum may not be sufficient
if ( (c>='A' && c<='Z') || (c>='0' && c<='9') || c=='-' || c=='+') {
sum += c ;
} else {
return 0;
}
}
while(*valeur) while(*valeur) {
sum += *valeur++ ; c = *valeur++ ;
// Add another validity check since checksum may not be sufficient (space authorized in Standard mode)
if ( (c>='A' && c<='Z') || (c>='0' && c<='9') || c==' ' || c=='.' || c=='-' || c=='+') {
sum += c ;
} else {
return 0;
}
}
if (horodate) { if (horodate) {
sum += _separator; sum += _separator;
while (*horodate) c = *horodate++;
sum += *horodate++ ; // Add another validity check starting season [E]té (Summer) or [H]iver (Winter)
if ( c=='E' || c=='H' || c=='e' || c=='h') {
sum += c ;
while (*horodate) {
c = *horodate++ ;
// Add another validity check for horodate digits
if ( c>='0' && c<='9') {
sum += c ;
} else {
return 0;
}
}
} else {
return 0;
}
} }
return ( (sum & 0x3f) + ' ' ) ; return ( (sum & 0x3f) + ' ' ) ;
@ -906,6 +935,7 @@ ValueList * TInfo::checkLine(char * pline)
if(strlen(ptok) && strlen(pvalue)) { if(strlen(ptok) && strlen(pvalue)) {
// Is checksum is OK // Is checksum is OK
char calc_checksum = calcChecksum(ptok,pvalue,pts); char calc_checksum = calcChecksum(ptok,pvalue,pts);
if ( calc_checksum == checksum) { if ( calc_checksum == checksum) {
// In case we need to do things on specific labels // In case we need to do things on specific labels
customLabel(ptok, pvalue, &flags); customLabel(ptok, pvalue, &flags);