[vlc-commits] macosx: escape sout filenames (fix #19841)

[Marvin Scholz]

vlc/vlc-3.0 | branch: master | Marvin Scholz  | Tue Feb 27 
02:25:32 2018 +0100| [14a4897c77e8e05a371d10ffb1af9129aed561eb] | committer: 
Marvin Scholz

macosx: escape sout filenames (fix #19841)

(cherry picked from commit be581ce69fa00d73fe9e08b176cad64bad9d3474)
Signed-off-by: Marvin Scholz 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=14a4897c77e8e05a371d10ffb1af9129aed561eb
---

 modules/gui/macosx/VLCConvertAndSaveWindowController.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m 
b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index 037cd40c5b..6877dc9214 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -938,7 +938,9 @@
 
 
 // add output destination
-[composedOptions appendFormat:@",access=file{no-overwrite},dst=%@}", 
_outputDestination];
+_outputDestination = [_outputDestination 
stringByReplacingOccurrencesOfString:@"\""
+   
withString:@"\\\""];
+[composedOptions 
appendFormat:@",access=file{no-overwrite},dst=\"%@\"}", _outputDestination];
 } else {
 /* streaming */
 if ([[[_streamTypePopup selectedItem] title] isEqualToString:@"RTP"])

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: escape sout filenames (fix #19841)

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Mon Feb 
26 13:24:51 2018 +0100| [42cf4bbc2909ade086da04a9d2132025cc275505] | committer: 
Marvin Scholz

macosx: escape sout filenames (fix #19841)

(cherry picked from commit 82547ae9b1d3128b496697893f5ccf947d15b3d0)
Signed-off-by: Marvin Scholz 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=42cf4bbc2909ade086da04a9d2132025cc275505
---

 modules/gui/macosx/VLCOutput.m | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VLCOutput.m b/modules/gui/macosx/VLCOutput.m
index 68bb3ce9a4..81d6ad2d6d 100644
--- a/modules/gui/macosx/VLCOutput.m
+++ b/modules/gui/macosx/VLCOutput.m
@@ -295,17 +295,20 @@
 else if ([mux isEqualToString: @"Raw"]) mux_string = @"raw";
 else mux_string = @"ts";
 
+NSString *filename_string =
+[[self.fileTextField stringValue] 
stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
+
 if ([mode isEqualToString: _NS("File")]) {
 if ([self.dumpCheckbox state] == NSOnState) {
 _soutMRL = [NSArray arrayWithObjects:@":demux=dump",
 [NSString stringWithFormat:
-@":demuxdump-file=%@",
-[self.fileTextField stringValue]], nil];
+@":demuxdump-file=\"%@\"",
+filename_string], nil];
 return;
 } else
 [mrl_string 
appendFormat:@"standard{mux=%@,access=file{no-overwrite},dst=\"%@\"}",
  mux_string,
- [self.fileTextField stringValue]];
+ filename_string];
 }
 else if ([mode isEqualToString: _NS("Stream")]) {
 mode = [self.streamTypePopup titleOfSelectedItem];

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: escape sout filenames (fix #19841)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Mon Feb 26 
13:24:51 2018 +0100| [82547ae9b1d3128b496697893f5ccf947d15b3d0] | committer: 
Marvin Scholz

macosx: escape sout filenames (fix #19841)

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

 modules/gui/macosx/VLCOutput.m | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VLCOutput.m b/modules/gui/macosx/VLCOutput.m
index 68bb3ce9a4..81d6ad2d6d 100644
--- a/modules/gui/macosx/VLCOutput.m
+++ b/modules/gui/macosx/VLCOutput.m
@@ -295,17 +295,20 @@
 else if ([mux isEqualToString: @"Raw"]) mux_string = @"raw";
 else mux_string = @"ts";
 
+NSString *filename_string =
+[[self.fileTextField stringValue] 
stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
+
 if ([mode isEqualToString: _NS("File")]) {
 if ([self.dumpCheckbox state] == NSOnState) {
 _soutMRL = [NSArray arrayWithObjects:@":demux=dump",
 [NSString stringWithFormat:
-@":demuxdump-file=%@",
-[self.fileTextField stringValue]], nil];
+@":demuxdump-file=\"%@\"",
+filename_string], nil];
 return;
 } else
 [mrl_string 
appendFormat:@"standard{mux=%@,access=file{no-overwrite},dst=\"%@\"}",
  mux_string,
- [self.fileTextField stringValue]];
+ filename_string];
 }
 else if ([mode isEqualToString: _NS("Stream")]) {
 mode = [self.streamTypePopup titleOfSelectedItem];

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: escape sout filenames (fix #19841)

[Marvin Scholz]

vlc | branch: master | Marvin Scholz  | Tue Feb 27 02:25:32 
2018 +0100| [be581ce69fa00d73fe9e08b176cad64bad9d3474] | committer: Marvin 
Scholz

macosx: escape sout filenames (fix #19841)

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

 modules/gui/macosx/VLCConvertAndSaveWindowController.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m 
b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index 1ff6e1b19b..b0efac7584 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -938,7 +938,9 @@
 
 
 // add output destination
-[composedOptions appendFormat:@",access=file{no-overwrite},dst=%@}", 
_outputDestination];
+_outputDestination = [_outputDestination 
stringByReplacingOccurrencesOfString:@"\""
+   
withString:@"\\\""];
+[composedOptions 
appendFormat:@",access=file{no-overwrite},dst=\"%@\"}", _outputDestination];
 } else {
 /* streaming */
 if ([[[_streamTypePopup selectedItem] title] isEqualToString:@"RTP"])

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits