Allow longer SRT filename paths.

Bump from 128 to 256.

git-svn-id: svn://localhost/HandBrake/trunk@3655 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 5922877..f9687fa 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -4722,8 +4722,10 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
                        sub_config.offset = ghb_settings_get_int(ssettings, "SrtOffset");
                        lang = ghb_settings_get_string(ssettings, "SrtLanguage");
                        code = ghb_settings_get_string(ssettings, "SrtCodeset");
-                       strncpy(sub_config.src_filename, filename, 128);
-                       strncpy(sub_config.src_codeset, code, 40);
+                       strncpy(sub_config.src_filename, filename, 255);
+                       sub_config.src_filename[255] = 0;
+                       strncpy(sub_config.src_codeset, code, 39);
+                       sub_config.src_codeset[39] = 0;
                        sub_config.force = 0;
                        sub_config.dest = PASSTHRUSUB;
                        sub_config.default_track = def;

diff --git a/libhb/common.h b/libhb/common.h
index bb394c4..0dd3a2d 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -131,7 +131,7 @@ struct hb_subtitle_config_s
     int  default_track; 
     
     /* SRT subtitle tracks only */
-    char src_filename[128];
+    char src_filename[256];
     char src_codeset[40];
     int64_t offset;
 };

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 9c7f199..3cac7cc 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -3158,8 +3158,10 @@ bool one_burned = FALSE;
                     sub_config.offset = [[tempObject objectForKey:@"subtitleTrackSrtOffset"] intValue];
                     
                     /* we need to srncpy file path and char code */
-                    strncpy(sub_config.src_filename, [[tempObject objectForKey:@"subtitleSourceSrtFilePath"] UTF8String], 128);
-                    strncpy(sub_config.src_codeset, [[tempObject objectForKey:@"subtitleTrackSrtCharCode"] UTF8String], 40);
+                    strncpy(sub_config.src_filename, [[tempObject objectForKey:@"subtitleSourceSrtFilePath"] UTF8String], 255);
+                    sub_config.src_filename[255] = 0;
+                    strncpy(sub_config.src_codeset, [[tempObject objectForKey:@"subtitleTrackSrtCharCode"] UTF8String], 39);
+                    sub_config.src_codeset[39] = 0;
                     
                     sub_config.force = 0;
                     sub_config.dest = PASSTHRUSUB;

diff --git a/test/test.c b/test/test.c
index e0ec36c..d6d0f57 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -1968,8 +1968,10 @@ static int HandleEvents( hb_handle_t * h )
                     sub_config.default_track = 
                            ( srtdefault != -1 ) && ( srtdefault == i + 1 );
                     sub_config.force = 0;
-                    strncpy( sub_config.src_filename, srtfile[i], 128);
-                    strncpy( sub_config.src_codeset, codeset, 40);
+                    strncpy( sub_config.src_filename, srtfile[i], 255);
+                    sub_config.src_filename[255] = 0;
+                    strncpy( sub_config.src_codeset, codeset, 39);
+                    sub_config.src_codeset[39] = 0;
                     sub_config.offset = offset;
 
                     hb_srt_add( job, &sub_config, lang);