diff --git a/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp b/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp
index 4229dba31a..74d151b8bb 100644
--- a/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp
+++ b/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp
@@ -85,6 +85,8 @@ static void dummyCallback1 (j_decompress_ptr) throw()
 static void jpegSkip (j_decompress_ptr decompStruct, long num) throw()
 {
     decompStruct->src->next_input_byte += num;
+
+    num = jmin (num, (int) decompStruct->src->bytes_in_buffer);
     decompStruct->src->bytes_in_buffer -= num;
 }