svn merge -r10968:10974 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

src/sbatch/sbatch.c

@@ -291,6 +291,9 @@ static void *get_script_buffer(const char *filename, int *size)
 	if (script_size == 0) {
 		error("Batch script is empty!");
 		goto fail;
+	} else if (script_size >= 0xffff) {
+		error("Job script exceeds size supported by slurm");
+		goto fail;
 	} else if (xstring_is_whitespace(buf)) {
 		error("Batch script contains only whitespace!");
 		goto fail;

src/srun/srun.c

@@ -856,6 +856,11 @@ _build_script (const char *argv0, char *fname, int file_type)
 
 	_get_options(buffer);
 
+	if (strlen(buffer) >= 0xffff) {
+		error("Job script exceeds size supported by slurm");
+		xfree(buffer);
+	}
+
 	return buffer;
 }