fix msan bug in pathops

src/pathops/SkOpEdgeBuilder.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkGeometry.h"
 #include "SkOpEdgeBuilder.h"
 #include "SkReduceOrder.h"
 
@@ skipping 13 matching lines @@
     }
     if (SkScalarAbs(pt->fY) < FLT_EPSILON_ORDERABLE_ERR) {
         pt->fY = 0;
     }
 }
 
 static bool can_add_curve(SkPath::Verb verb, SkPoint* curve) {
     if (SkPath::kMove_Verb == verb) {
         return false;
     }
-    for (int index = 0; index < SkPathOpsVerbToPoints(verb); ++index) {
+    for (int index = 0; index <= SkPathOpsVerbToPoints(verb); ++index) {
         force_small_to_zero(&curve[index]);
     }
     return SkPath::kLine_Verb != verb || !SkDPoint::ApproximatelyEqual(curve[0], curve[1]);
 }
 
 void SkOpEdgeBuilder::addOperand(const SkPath& path) {
     SkASSERT(fPathVerbs.count() > 0 && fPathVerbs.end()[-1] == SkPath::kDone_Verb);
     fPathVerbs.pop();
     fPath = &path;
     fXorMask[1] = (fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask
@@ skipping 157 matching lines @@
                         SkPoint pair[5];
                         if (SkChopQuadAtMaxCurvature(pointsPtr, pair) == 1) {
                             goto addOneQuad;
                         }
                         if (!SkScalarsAreFinite(&pair[0].fX, SK_ARRAY_COUNT(pair) * 2)) {
                             return false;
                         }
                         SkPoint cStorage[2][2];
                         SkPath::Verb v1 = SkReduceOrder::Quad(&pair[0], cStorage[0]);
                         SkPath::Verb v2 = SkReduceOrder::Quad(&pair[2], cStorage[1]);
-                        SkPoint* curve1 = v1 == SkPath::kQuad_Verb ? &pair[0] : cStorage[0];
-                        SkPoint* curve2 = v2 == SkPath::kQuad_Verb ? &pair[2] : cStorage[1];
+                        SkPoint* curve1 = v1 != SkPath::kLine_Verb ? &pair[0] : cStorage[0];
+                        SkPoint* curve2 = v2 != SkPath::kLine_Verb ? &pair[2] : cStorage[1];
                         if (can_add_curve(v1, curve1) && can_add_curve(v2, curve2)) {
                             fCurrentContour->addCurve(v1, curve1);
                             fCurrentContour->addCurve(v2, curve2);
                             break;
                         }
                     }
                 }
             addOneQuad:
                 fCurrentContour->addQuad(pointsPtr);
                 break;
             case SkPath::kConic_Verb: {
                 SkVector v1 = pointsPtr[1] - pointsPtr[0];
                 SkVector v2 = pointsPtr[2] - pointsPtr[1];
                 SkScalar weight = *weightPtr++;
                 if (v1.dot(v2) < 0) {
                     // FIXME: max curvature for conics hasn't been implemented; use placeholder
                     SkScalar maxCurvature = SkFindQuadMaxCurvature(pointsPtr);
                     if (maxCurvature > 0) {
                         SkConic conic(pointsPtr, weight);
                         SkConic pair[2];
                         conic.chopAt(maxCurvature, pair);
                         SkPoint cStorage[2][3];
                         SkPath::Verb v1 = SkReduceOrder::Conic(pair[0], cStorage[0]);
                         SkPath::Verb v2 = SkReduceOrder::Conic(pair[1], cStorage[1]);
-                        SkPoint* curve1 = v1 == SkPath::kConic_Verb ? pair[0].fPts : cStorage[0];
-                        SkPoint* curve2 = v2 == SkPath::kConic_Verb ? pair[1].fPts : cStorage[1];
+                        SkPoint* curve1 = v1 != SkPath::kLine_Verb ? pair[0].fPts : cStorage[0];
+                        SkPoint* curve2 = v2 != SkPath::kLine_Verb ? pair[1].fPts : cStorage[1];
                         if (can_add_curve(v1, curve1) && can_add_curve(v2, curve2)) {
                             fCurrentContour->addCurve(v1, curve1, pair[0].fW);
                             fCurrentContour->addCurve(v2, curve2, pair[1].fW);
                             break;
                         }
                     }
                 }
                 fCurrentContour->addConic(pointsPtr, weight);
                 } break;
             case SkPath::kCubic_Verb:
@@ skipping 34 matching lines @@
         }
         SkASSERT(fCurrentContour);
         fCurrentContour->debugValidate();
         pointsPtr += SkPathOpsVerbToPoints(verb);
     }
    if (fCurrentContour && fCurrentContour->count() &&!fAllowOpenContours && !close()) {
        return false;
    }
    return true;
 }