commit 217d4a556b51e1546021a0a8a53d5562096718c1
author Florin Malita <fmalita@chromium.org> Tue Sep 18 10:05:30 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 18 14:28:53 2018 +0000
tree f7c3b366dc57d03bffddfc1df81ccf6a397ccf3f
parent afa35022d93c8b2a9abcb5c931fe70019150854f

[skottie] UBSAN divide-by-zero workaround

Use sk_ieee_float_divide to silence UBSAN.

(note: the result is already checked to be finite)

Bug: skia:10041
Change-Id: I97d1d6f84926b7162ed636be7afd052ca42d8e81
Reviewed-on: https://skia-review.googlesource.com/155165
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

modules/skottie/src/Skottie.cpp

diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp
index 168aea7..5d471df 100644
--- a/modules/skottie/src/Skottie.cpp
+++ b/modules/skottie/src/Skottie.cpp
@@ -223,7 +223,7 @@
     const auto fps      = ParseDefault<float>(json["fr"], -1.0f),
                inPoint  = ParseDefault<float>(json["ip"], 0.0f),
                outPoint = SkTMax(ParseDefault<float>(json["op"], SK_ScalarMax), inPoint),
-               duration = (outPoint - inPoint) / fps;
+               duration = sk_ieee_float_divide(outPoint - inPoint, fps);
 
     if (size.isEmpty() || version.isEmpty() || fps <= 0 ||
         !SkScalarIsFinite(inPoint) || !SkScalarIsFinite(outPoint) || !SkScalarIsFinite(duration)) {