Fixed issue #17221: Check data integrity crash with SQL error when # …

…is use in the name of field
LimeSurvey · Apr 6, 2021 · 3912d51 · 3912d51
1 parent 50ed575
commit 3912d51
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/application/controllers/admin/checkintegrity.php b/application/controllers/admin/checkintegrity.php
@@ -521,14 +521,17 @@ protected function _checkintegrity()
                             // QID field can be more than just QID, like: 886other or 886A1
                             // So we clean it by finding the first alphabetical character
                             $sDirtyQid = $aFields[2];
-                            preg_match('~[a-zA-Z_]~i', $sDirtyQid, $match, PREG_OFFSET_CAPTURE);
+                            preg_match('~[a-zA-Z_#]~i', $sDirtyQid, $match, PREG_OFFSET_CAPTURE);
 
                             if (isset($match[0][1])){
                                 $sQID      =  substr ($sDirtyQid, 0, $match[0][1]);
                             }else{
                                 // It was just the QID....
                                 $sQID      =  $sDirtyQid;
                             }
+                            if ((string) intval($sQID) !== $sQID) {
+                                throw new \Exception('sQID is not an integer: ' . $sQID);
+                            }
 
                             // Here, we get the question as defined in backend
                             $oQuestion = Question::model()->findByAttributes([ 'qid' => $sQID , 'language' => $oSurvey->language, 'sid' => $oSurvey->sid ]);