Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

iOS GUI: Prevent out-of-memory when parsing large file #1018

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

iOS GUI: Prevent out-of-memory when parsing large file #1018

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions Source/GUI/iOS/MediaInfo/Core.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,30 +174,37 @@ class Core {
MediaInfo_Open_Buffer_Init(mi, fileSize, 0)

while true {
let data: Data = file.readData(ofLength: 1024 * 1024)
var state: States = States(rawValue: 0)
let size = data.count
let finished = autoreleasepool {
let data: Data = file.readData(ofLength: 1024 * 1024)
var state: States = States(rawValue: 0)
let size = data.count

let buffer: UnsafeMutablePointer<MediaInfo_int8u> = UnsafeMutablePointer<MediaInfo_int8u>.allocate(capacity: size)
data.copyBytes(to: buffer, count: size)
state = States(rawValue: Int(MediaInfo_Open_Buffer_Continue(mi, buffer, UInt(size))))
buffer.deallocate()

if state == States.Finalized {
return true
}

let buffer: UnsafeMutablePointer<MediaInfo_int8u> = UnsafeMutablePointer<MediaInfo_int8u>.allocate(capacity: size)
data.copyBytes(to: buffer, count: size)
state = States(rawValue: MediaInfo_Open_Buffer_Continue(mi, buffer, size))
buffer.deallocate()
// test if there is a MediaInfo request to go elsewhere
let seekTo: MediaInfo_int64u = MediaInfo_Open_Buffer_Continue_GoTo_Get(mi)

if state == States.Finalized {
break
}
if seekTo != MediaInfo_int64u.max {
file.seek(toFileOffset: seekTo)
MediaInfo_Open_Buffer_Init(mi, fileSize, file.offsetInFile) // inform MediaInfo we have seek
return false
}

// test if there is a MediaInfo request to go elsewhere
let seekTo: MediaInfo_int64u = MediaInfo_Open_Buffer_Continue_GoTo_Get(mi)
// EOF and no seekTo request
if data.count == 0 {
return true
}

if seekTo != MediaInfo_int64u.max {
file.seek(toFileOffset: seekTo)
MediaInfo_Open_Buffer_Init(mi, fileSize, file.offsetInFile) // inform MediaInfo we have seek
continue
return false
}

// EOF and no seekTo request
if data.count == 0 {
if (finished) {
break
}
}
Expand Down Expand Up @@ -252,7 +259,7 @@ class Core {
let cArray: UnsafeMutablePointer<MediaInfo_int8u> = UnsafeMutablePointer(mutating: report)

MediaInfo_Open_Buffer_Init(mi, MediaInfo_int64u(report.count), MediaInfo_int64u(0))
MediaInfo_Open_Buffer_Continue(mi, cArray, report.count)
MediaInfo_Open_Buffer_Continue(mi, cArray, UInt(report.count))
MediaInfo_Open_Buffer_Finalize(mi)

output = wideStringToString(wideString: MediaInfo_Inform(mi, 0))
Expand Down