2 files changed, 11 insertions, 8 deletions
diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp
index 28b925dda2..322835f294 100644
--- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp
+++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp
@@ -843,16 +843,20 @@ int32_t CFDE_CSSValueListParser::SkipTo(FX_WCHAR wch,
                                         FX_BOOL bBrContinue) {
   const FX_WCHAR* pStart = m_pCur;
   if (!bBrContinue) {
-    if (bWSSeparator)
-      while (++m_pCur<m_pEnd&& * m_pCur != wch&& * m_pCur> ' ')
-        ;
-    else
-      while (++m_pCur < m_pEnd && *m_pCur != wch)
-        ;
+    if (bWSSeparator) {
+      while ((++m_pCur < m_pEnd) && (*m_pCur != wch) && (*m_pCur > ' ')) {
+        continue;
+      }
+    } else {
+      while (++m_pCur < m_pEnd && *m_pCur != wch) {
+        continue;
+      }
+    }
+
   } else {
     int32_t iBracketCount = 0;
     if (bWSSeparator) {
-      while (m_pCur<m_pEnd&& * m_pCur != wch&& * m_pCur> ' ') {
+      while ((m_pCur < m_pEnd) && (*m_pCur != wch) && (*m_pCur > ' ')) {
         if (*m_pCur == '(') {
           iBracketCount++;
         } else if (*m_pCur == ')') {
diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp
index b10a6ecbd7..8d54574274 100644
--- a/xfa/src/fdp/src/tto/fde_textout.cpp
+++ b/xfa/src/fdp/src/tto/fde_textout.cpp
@@ -869,7 +869,6 @@ void CFDE_TextOut::DrawLine(const FDE_LPTTOPIECE pPiece, IFDE_Pen*& pPen) {
     if (bVertical) {
       pt1.x = rtText.left + rtText.width * 2.0f / 5.0f;
       pt1.y = rtText.top;
-      ;
       pt2.x = pt1.x;
       pt2.y = rtText.bottom();
     } else {