diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index aa7513c..6ab1c89 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -135,6 +135,7 @@
         fDone = true;
         fTop = fBottom = clip.fBounds.fBottom;
         fData = NULL;
+        fCurrYOff = NULL;
         fStopYOff = NULL;
         return;
     }
diff --git a/src/core/SkPathRef.h b/src/core/SkPathRef.h
index da9f991..31eafe8 100644
--- a/src/core/SkPathRef.h
+++ b/src/core/SkPathRef.h
@@ -411,17 +411,22 @@
             case SkPath::kLine_Verb:
                 pCnt = 1;
                 break;
-            case SkPath::kConic_Verb:
             case SkPath::kQuad_Verb:
+                // fall through
+            case SkPath::kConic_Verb:
                 pCnt = 2;
                 break;
             case SkPath::kCubic_Verb:
                 pCnt = 3;
                 break;
+            case SkPath::kClose_Verb:
+                pCnt = 0;
+                break;
             case SkPath::kDone_Verb:
                 SkASSERT(!"growForVerb called for kDone");
                 // fall through
-            case SkPath::kClose_Verb:
+            default:
+                SkASSERT(!"default is not reached");
                 pCnt = 0;
         }
         size_t space = sizeof(uint8_t) + pCnt * sizeof (SkPoint);