diff --git a/src/pathops/SkOpEdgeBuilder.cpp b/src/pathops/SkOpEdgeBuilder.cpp
index 120a503..c1224c3 100644
--- a/src/pathops/SkOpEdgeBuilder.cpp
+++ b/src/pathops/SkOpEdgeBuilder.cpp
@@ -306,7 +306,8 @@
                             split->fT[0] = splits[prior].fT[0];
                         }
                         int next = index;
-                        while (next < breaks && !splits[next + 1].fCanAdd) {
+                        int breakLimit = SkTMin(breaks, (int) SK_ARRAY_COUNT(splits) - 1);
+                        while (next < breakLimit && !splits[next + 1].fCanAdd) {
                             ++next;
                         }
                         if (next > index) {
diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index 5e8ec63..1c7f5df 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -100,11 +100,6 @@
     layoutlex_init(&fLayoutScanner);
     fBuffer = sksl_scan_string(text.c_str(), fScanner);
     skslset_lineno(1, fScanner);
-
-    if (false) {
-        // avoid unused warning
-        yyunput(0, nullptr, fScanner);
-    }
 }
 
 Parser::~Parser() {
diff --git a/src/sksl/disable_flex_warnings.h b/src/sksl/disable_flex_warnings.h
index fa11eda..ad73b63 100644
--- a/src/sksl/disable_flex_warnings.h
+++ b/src/sksl/disable_flex_warnings.h
@@ -24,3 +24,5 @@
 #pragma warning(push)
 #pragma warning(disable:4018)
 #endif
+
+#define YY_NO_UNPUT