From 2bc43eb88632bd11c8a68f6f2f0ae9e62c466e57 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 20 Jan 2012 05:14:56 +0000 Subject: [PATCH] Fix use of uninitialized variable when setting margins to an empty string Originally committed to SVN as r6322. --- aegisub/src/ass_dialogue.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp index c73cda64e..33d969eb5 100644 --- a/aegisub/src/ass_dialogue.cpp +++ b/aegisub/src/ass_dialogue.cpp @@ -372,15 +372,9 @@ void AssDialogue::SetMarginString(const wxString origvalue,int which) { } // Get value - long value; + long value = 0; strvalue.ToLong(&value); - - // Cap it - if (value < 0) value = 0; - if (value > 9999) value = 9999; - - // Assign - Margin[which] = value; + Margin[which] = mid(0, value, 9999); } wxString AssDialogue::GetMarginString(int which,bool pad) const {