[vlc-commits] Revert "demux: hls: fix truncated value (cid #1346923, #1313683)"

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan  2 20:46:30 2016 +0200| [95422ad55940c46efdc7b8d2a0e0ba7db631761a] | committer: Rémi Denis-Courmont

Revert "demux: hls: fix truncated value (cid #1346923, #1313683)"

This reverts commit 7661da70f194138b645d3630d035b97830ef319c.
This does not fix the overflow as claimed.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=95422ad55940c46efdc7b8d2a0e0ba7db631761a
---

 modules/demux/hls/playlist/Tags.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/hls/playlist/Tags.cpp b/modules/demux/hls/playlist/Tags.cpp
index fcbf57f..9c25fc4 100644
--- a/modules/demux/hls/playlist/Tags.cpp
+++ b/modules/demux/hls/playlist/Tags.cpp
@@ -78,8 +78,8 @@ std::pair<std::size_t,std::size_t> Attribute::getByteRange() const
         is >> length;
         if(!is.eof())
         {
-            char c;
-            if(is.get(c) && c == '@')
+            char c = is.get();
+            if(c == '@' && !is.eof())
                 is >> offset;
         }
     }
@@ -97,8 +97,8 @@ std::pair<int, int> Attribute::getResolution() const
         is >> w;
         if(!is.eof())
         {
-            char c;
-            if(is.get(c) && c == 'x')
+            char c = is.get();
+            if(c == 'x' && !is.eof())
                 is >> h;
         }
     }